[Python-checkins] r85331 - sandbox/trunk/setuptools/setuptools/archive_util.py
phillip.eby
python-checkins at python.org
Sat Oct 9 05:23:20 CEST 2010
Author: phillip.eby
Date: Sat Oct 9 05:23:19 2010
New Revision: 85331
Log:
Don't crash if an unextractable symlink is found.
Modified:
sandbox/trunk/setuptools/setuptools/archive_util.py
Modified: sandbox/trunk/setuptools/setuptools/archive_util.py
==============================================================================
--- sandbox/trunk/setuptools/setuptools/archive_util.py (original)
+++ sandbox/trunk/setuptools/setuptools/archive_util.py Sat Oct 9 05:23:19 2010
@@ -185,10 +185,10 @@
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):
More information about the Python-checkins
mailing list