aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/package_index.py
diff options
context:
space:
mode:
authorJens Timmerman <jens.timmerman@ugent.be>2016-06-08 18:04:00 +0200
committerJens Timmerman <jens.timmerman@ugent.be>2016-07-25 16:14:52 +0200
commit1e5bb5e680d00fcfc74078d0ea2d12760879b3c7 (patch)
tree2d9fa04c620b11a3041426f2d73a06dd59e70604 /setuptools/package_index.py
parent3fcd44be1e8d3d8b9f229333e8f43d4893658183 (diff)
downloadexternal_python_setuptools-1e5bb5e680d00fcfc74078d0ea2d12760879b3c7.tar.gz
external_python_setuptools-1e5bb5e680d00fcfc74078d0ea2d12760879b3c7.tar.bz2
external_python_setuptools-1e5bb5e680d00fcfc74078d0ea2d12760879b3c7.zip
addressed remarks, None, None since a tuple is expected
Diffstat (limited to 'setuptools/package_index.py')
-rwxr-xr-xsetuptools/package_index.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 8f8bf6ed..a6918123 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -605,14 +605,15 @@ class PackageIndex(Environment):
mylocation = self.download(dist.location, tmpdir)
if os.path.exists(mylocation):
return dist, mylocation
+ return None, None
if force_scan:
self.prescan()
self.find_packages(requirement)
dist, mylocation = find(requirement)
- if local_index is not None:
- dist, mylocation = dist, mylocation if dist else find(requirement, local_index)
+ if not dist and local_index is not None:
+ dist, mylocation = find(requirement, local_index)
if dist is None:
if self.to_scan is not None: