summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphillip.eby <phillip.eby@6015fed2-1504-0410-9fe1-9d1591cc4771>2010-10-09 03:23:19 +0000
committerphillip.eby <phillip.eby@6015fed2-1504-0410-9fe1-9d1591cc4771>2010-10-09 03:23:19 +0000
commit1f8b218326dc92d8651166b92e20167cd520bb3d (patch)
tree387bf9f36aa1c77f67fe08ee7b9df8c1cc7a1c33
parent972c32203db2f3834d9fc8847cb83d9e2db7d72d (diff)
downloadpython-setuptools-1f8b218326dc92d8651166b92e20167cd520bb3d.tar.gz
Don't crash if an unextractable symlink is found.
git-svn-id: http://svn.python.org/projects/sandbox/trunk/setuptools@85331 6015fed2-1504-0410-9fe1-9d1591cc4771
-rwxr-xr-xsetuptools/archive_util.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index 7d7a81b..fd41d77 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):