summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphillip.eby <phillip.eby@6015fed2-1504-0410-9fe1-9d1591cc4771>2010-10-09 03:32:35 +0000
committerphillip.eby <phillip.eby@6015fed2-1504-0410-9fe1-9d1591cc4771>2010-10-09 03:32:35 +0000
commit5a8917839e0d8f721c73af80fa1d7fcde4540433 (patch)
tree7efc8eff4aea6f8b3f3c1dc24706ddd69d14f22a
parent1f8b218326dc92d8651166b92e20167cd520bb3d (diff)
downloadpython-setuptools-5a8917839e0d8f721c73af80fa1d7fcde4540433.tar.gz
Argh. Missing parens.
git-svn-id: http://svn.python.org/projects/sandbox/trunk/setuptools@85333 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 fd41d77..a8c93ca 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 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):