summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanno Schlichting <hanno@hannosch.eu>2009-07-16 18:54:30 +0200
committerHanno Schlichting <hanno@hannosch.eu>2009-07-16 18:54:30 +0200
commit30c03d3555f368bf3095fe8b7fe056ae4eceae73 (patch)
tree41b74b6aa9e02c811b1d469d72b5f18efae43ac5
parentcac5b9459354a31ebd3d976a66647a301d23aa57 (diff)
downloadpython-setuptools-bitbucket-30c03d3555f368bf3095fe8b7fe056ae4eceae73.tar.gz
Protected against failures in tarfile extraction, as we use a private method which can raise those. Patch as per PJE's setuptools trunk commit r65946. This closes #10.
-rwxr-xr-xsetuptools/archive_util.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index 511f05ad..ab786f3d 100755
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -189,7 +189,10 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
if dst:
if dst.endswith(os.sep):
dst = dst[:-1]
- tarobj._extract_member(member,dst) # XXX Ugh
+ try:
+ tarobj._extract_member(member,dst) # XXX Ugh
+ except tarfile.ExtractError:
+ pass # chown/chmod/mkfifo/mknode/makedev failed
return True
finally:
tarobj.close()