Fixed #22681 -- Made TarArchive recognize leading directories properly.

django · Jun 3, 2014 · 083d285 · 083d285
1 parent 61960dd
commit 083d285
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 1 deletion.
diff --git a/django/utils/archive.py b/django/utils/archive.py
@@ -144,7 +144,7 @@ def extract(self, to_path):
         # note: python<=2.5 doesn't seem to know about pax headers, filter them
         members = [member for member in self._archive.getmembers()
                    if member.name != 'pax_global_header']
-        leading = self.has_leading_dir(members)
+        leading = self.has_leading_dir(x.name for x in members)
         for member in members:
             name = member.name
             if leading:

diff --git a/tests/utils_tests/archives/leadpath_foobar.tar b/tests/utils_tests/archives/leadpath_foobar.tar
diff --git a/tests/utils_tests/archives/leadpath_foobar.tar.bz2 b/tests/utils_tests/archives/leadpath_foobar.tar.bz2
diff --git a/tests/utils_tests/archives/leadpath_foobar.tar.gz b/tests/utils_tests/archives/leadpath_foobar.tar.gz
diff --git a/tests/utils_tests/archives/leadpath_foobar.zip b/tests/utils_tests/archives/leadpath_foobar.zip
diff --git a/tests/utils_tests/test_archive.py b/tests/utils_tests/test_archive.py
@@ -21,6 +21,7 @@ def setUp(self):
         self.tmpdir = tempfile.mkdtemp()
         self.addCleanup(shutil.rmtree, self.tmpdir)
         self.archive_path = os.path.join(TEST_DIR, self.archive)
+        self.archive_lead_path = os.path.join(TEST_DIR, "leadpath_%s" % self.archive)
         # Always start off in TEST_DIR.
         os.chdir(TEST_DIR)
 
@@ -42,6 +43,10 @@ def test_extract_function(self):
         extract(self.archive_path, self.tmpdir)
         self.check_files(self.tmpdir)
 
+    def test_extract_function_with_leadpath(self):
+        extract(self.archive_lead_path, self.tmpdir)
+        self.check_files(self.tmpdir)
+
     def test_extract_function_no_to_path(self):
         os.chdir(self.tmpdir)
         extract(self.archive_path)