From 8d6e0d45882444cf528b10832811fa19613f184a Mon Sep 17 00:00:00 2001
From: Alexandr Shurigin <ya@helldude.ru>
Date: Thu, 22 May 2014 19:12:22 +0700
Subject: [PATCH] [1.7.x] Fixed #22681 -- Made TarArchive recognize leading
 directories properly.

Backport of 083d285b82 from master
---
 django/utils/archive.py                          |   2 +-
 tests/utils_tests/archives/leadpath_foobar.tar   | Bin 0 -> 5632 bytes
 .../utils_tests/archives/leadpath_foobar.tar.bz2 | Bin 0 -> 265 bytes
 .../utils_tests/archives/leadpath_foobar.tar.gz  | Bin 0 -> 265 bytes
 tests/utils_tests/archives/leadpath_foobar.zip   | Bin 0 -> 1402 bytes
 tests/utils_tests/test_archive.py                |   5 +++++
 6 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 tests/utils_tests/archives/leadpath_foobar.tar
 create mode 100644 tests/utils_tests/archives/leadpath_foobar.tar.bz2
 create mode 100644 tests/utils_tests/archives/leadpath_foobar.tar.gz
 create mode 100644 tests/utils_tests/archives/leadpath_foobar.zip

diff --git a/django/utils/archive.py b/django/utils/archive.py
index 90b72593a9..6a47b00502 100644
--- a/django/utils/archive.py
+++ b/django/utils/archive.py
@@ -144,7 +144,7 @@ class TarArchive(BaseArchive):
         # 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
new file mode 100644
index 0000000000000000000000000000000000000000..3ff38d72f5fba4567480454726cf451206b0d830
GIT binary patch
literal 5632
zcmeH~+X{m)42FG_zQNK{`aF(qAh-!`zW>sCK#CU@4D2GksmVo1^Z6%j|7c_E##_U<
z03dj;nzZA*YXjLPS6)gR>%eO3gI1u8H=$9UF{dr`^!c_Ur5307*qjF+ZG3g_1OMt;
z&XEpDOResI-}{BXW=xdofzF-ePd^IrM=*^7#+<g$!awWZYz4Xgql!O5)_)-V3;*j`
zlo40`KZk*B1`z+#{U0Iqe`~=>|1Vi_*n9q5GoVWU!Dar4qJIwFWz0Q)t{G6rA2a`;
zg@4J4!`}11w><BFy8fT|JMdomKL_tJX33vp2Gr;uA>IESy#Pi3B`XfQ<j*k!>iB2<
W>-7GY`#%S9i76G33P=U!3j6>p_|UHa

literal 0
HcmV?d00001

diff --git a/tests/utils_tests/archives/leadpath_foobar.tar.bz2 b/tests/utils_tests/archives/leadpath_foobar.tar.bz2
new file mode 100644
index 0000000000000000000000000000000000000000..15f47ca179937f8a9507196fc1dab607de8cec40
GIT binary patch
literal 265
zcmV+k0rvhvT4*^jL0KkKS@Yb`v;YC=|B%pt0Kh;1|9}7h%)oaio&W?u00=MvBSi?5
z2qI|p8Uc{dXkgPunqe_AU?6FMQl_8)06jnhC&C`cYr9%fl%+UtBqTS1)Fyz7jkeP|
zn^Pb|q8X~{qXakzQ467hLP;z++SIm%XKEO8=?MuV2T{>SdKpkr!fb_zb8>N3wZjZ@
zC6LKTW`#Avw4^Mf<oJ{m2wsei5RKWzQ;n*HU66=Wt_M1yXF<`+I-vtP%$nquy{=yO
zjYh~)RHchDAvF;5L)8z&IlLZdey5mH8DU6#h6MWy(7NGBTMsE{>Lp~6cOlgbA=M7_
Pf5qI9P81|O_cSd4>(g)0

literal 0
HcmV?d00001

diff --git a/tests/utils_tests/archives/leadpath_foobar.tar.gz b/tests/utils_tests/archives/leadpath_foobar.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..7b5ba7eda429f618998d63c6d72e088620bc01e3
GIT binary patch
literal 265
zcmV+k0rvhMiwFQJn1NFO1MSyM3c@fD1>hbfH*oSdIZq`Dg=(SN`<te%6c@z^6A<3F
z$s$5ypEDEtOB-W1o*F?!6ueh?<z>}|^14ylSVvY{AGAul-h@VZ$wO_X$Fm*NQQ{OY
zN1tost-BxWuixXn{)v9gUkg4Xy$^Qo%ly+1CG9eqMv>r|-jILJ-v~aVD1WA0{~;j%
z8n*ne!yq;TO8P(3-2bg5hyGu~K7XkhP*nfH<@}jZ|26FMmzn`(`E$-cXyjkRKL2wo
z^FN@h|Ihh5@*e%ahR^&ZW<W{(GtKvZmu`Tl{~A8?mzV)%`SX%L?*9M)0000000000
P06%*HyOB!m04M+eQiXu3

literal 0
HcmV?d00001

diff --git a/tests/utils_tests/archives/leadpath_foobar.zip b/tests/utils_tests/archives/leadpath_foobar.zip
new file mode 100644
index 0000000000000000000000000000000000000000..8437c1ac03eb1ff1a181a4b4c7873d1b784f2d36
GIT binary patch
literal 1402
zcmbW$&q~8U5C-r`lS<=1(wm3kD@gkWiZ?HTv<DRrDXkzVwSu5fgdFNC=)q%OqHo}n
zh!>B&JCn(_+u3!Onvjq~@?*Z;FX>qrZ37+W<N0a%P~95Pg4<y}7~DJ@^|~>H&u>K*
zzZco#(+&jDA^?a|d^cSRnGj-4XqUtt5}}LeI*3k5-1~?tLF{T%T#rVarSN6B5XzoV
zIM2j4%%z9nOfNnr7fd3i>F3oRz4~%VscDfo+jP^RY!v6CsjS-`)DFYH+ILX(FoB<A
zdR%p}&RsNmxYEofDh*&(oM;+mMUHyu;LKL)+*IQ*FLKmT2WK`^ag_B_<G8OVQePdS
z*;XY|-hKR4)#{PRnW?)D(rm6y_5{hfsmBgdb}s=%Qtl5ya;GsnwPyphxl}3pmqq3L
f)bD?@?b`a1(y+V+)@kcoxTz51`Hde=@B;V+4}ABG

literal 0
HcmV?d00001

diff --git a/tests/utils_tests/test_archive.py b/tests/utils_tests/test_archive.py
index f00f25e855..6f1b66b14b 100644
--- a/tests/utils_tests/test_archive.py
+++ b/tests/utils_tests/test_archive.py
@@ -21,6 +21,7 @@ class ArchiveTester(object):
         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 @@ class ArchiveTester(object):
         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)