diff options
| author | PJ Eby <distutils-sig@python.org> | 2010-10-09 03:24:25 +0000 |
|---|---|---|
| committer | PJ Eby <distutils-sig@python.org> | 2010-10-09 03:24:25 +0000 |
| commit | e6990dd3de14acea85f2285dddc5956318f139ee (patch) | |
| tree | 28a7c204f31f65c1079a236bd3de4e3faadee86c /setuptools | |
| parent | 7cfca7995a9e5de15663ea4f6e754aa001e6ea98 (diff) | |
| download | external_python_setuptools-e6990dd3de14acea85f2285dddc5956318f139ee.tar.gz external_python_setuptools-e6990dd3de14acea85f2285dddc5956318f139ee.tar.bz2 external_python_setuptools-e6990dd3de14acea85f2285dddc5956318f139ee.zip | |
Backport from trunk
--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4085332
Diffstat (limited to 'setuptools')
| -rwxr-xr-x | setuptools/archive_util.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py index be813746..15d38de5 100755 --- a/setuptools/archive_util.py +++ b/setuptools/archive_util.py @@ -185,10 +185,10 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter): if not name.startswith('/') and '..' not in name: dst = os.path.join(extract_dir, *name.split('/')) - while member.islnk() or member.issym(): + while member is not None and member.islnk() or member.issym(): member = tarobj._getmember(member.linkname, member) - if member.isfile() or member.isdir(): + if member is not None and member.isfile() or member.isdir(): dst = progress_filter(name, dst) if dst: if dst.endswith(os.sep): |