Merge pull request #328 from coreos-inc/fixtarheders

Fix tarfile to support non-unicode pax fields

test/test_changes.py

@@ -62,5 +62,12 @@ class TestChanges(unittest.TestCase):
 
     self.assertIn('another_file', deleted_prefixes)
 
+  def test_pax_tarfile_error(self):
+    # If this fails it will raise an exception
+    with open('test/data/sample/layers/paxheader.tar') as tarstream:
+      result = list(files_and_dirs_from_tar(tarstream, set()))
+
+    self.assertIn('/file', result)
+
 if __name__ == '__main__':
   unittest.main()

util/registry/changes.py

@@ -1,6 +1,8 @@
 import marisa_trie
 import os
-import tarfile
+
+import util.vendor.paxtarfile as tarfile
+
 from util.registry.aufs import is_aufs_metadata, get_deleted_prefix
 
 ALLOWED_TYPES = {tarfile.REGTYPE, tarfile.AREGTYPE}