diff options
| author | Hanno Schlichting <hanno@hannosch.eu> | 2009-07-16 18:54:30 +0200 |
|---|---|---|
| committer | Hanno Schlichting <hanno@hannosch.eu> | 2009-07-16 18:54:30 +0200 |
| commit | b83d5bd69240600575bc086100d9bab8ca854073 (patch) | |
| tree | 41b74b6aa9e02c811b1d469d72b5f18efae43ac5 /setuptools/archive_util.py | |
| parent | e4ab19caa7979f2ecedf223fac6a6dee69c25986 (diff) | |
| download | external_python_setuptools-b83d5bd69240600575bc086100d9bab8ca854073.tar.gz external_python_setuptools-b83d5bd69240600575bc086100d9bab8ca854073.tar.bz2 external_python_setuptools-b83d5bd69240600575bc086100d9bab8ca854073.zip | |
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.
--HG--
branch : distribute
extra : rebase_source : c621c9d165d820c32bc08d9a9a168074842e3d66
Diffstat (limited to 'setuptools/archive_util.py')
| -rwxr-xr-x | setuptools/archive_util.py | 5 |
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() |