[Python-checkins] r85334 - sandbox/branches/setuptools-0.6/setuptools/archive_util.py

[phillip.eby]

Author: phillip.eby
Date: Sat Oct  9 05:33:27 2010
New Revision: 85334

Log:
Backport.


Modified:
   sandbox/branches/setuptools-0.6/setuptools/archive_util.py

Modified: sandbox/branches/setuptools-0.6/setuptools/archive_util.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/archive_util.py	(original)
+++ sandbox/branches/setuptools-0.6/setuptools/archive_util.py	Sat Oct  9 05:33:27 2010
@@ -185,10 +185,10 @@
             if not name.startswith('/') and '..' not in name:
                 dst = os.path.join(extract_dir, *name.split('/'))
 
-                while member is not None and member.islnk() or member.issym():
+                while member is not None and (member.islnk() or member.issym()):
                     member = tarobj._getmember(member.linkname, member)
     
-                if member is not None and 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):