diff options
| author | PJ Eby <distutils-sig@python.org> | 2009-10-12 20:05:56 +0000 |
|---|---|---|
| committer | PJ Eby <distutils-sig@python.org> | 2009-10-12 20:05:56 +0000 |
| commit | 11e0e840b1d2b9b2e4326facb2f05eacec71bafa (patch) | |
| tree | 276a6c43e121a2e98329bf011b235a45ef764634 /setuptools | |
| parent | 9294929b0028f551a54dd48cc3325581933b3c5f (diff) | |
| download | external_python_setuptools-11e0e840b1d2b9b2e4326facb2f05eacec71bafa.tar.gz external_python_setuptools-11e0e840b1d2b9b2e4326facb2f05eacec71bafa.tar.bz2 external_python_setuptools-11e0e840b1d2b9b2e4326facb2f05eacec71bafa.zip | |
Backport fixes for issues 16 & 23 from trunk
--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4075386
Diffstat (limited to 'setuptools')
| -rwxr-xr-x | setuptools/archive_util.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py index 511f05ad..5d72e7ed 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() @@ -200,6 +203,3 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter): extraction_drivers = unpack_directory, unpack_zipfile, unpack_tarfile - - - |