From 1e5bb5e680d00fcfc74078d0ea2d12760879b3c7 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Wed, 8 Jun 2016 18:04:00 +0200 Subject: addressed remarks, None, None since a tuple is expected --- setuptools/package_index.py | 5 +++-- 1 file 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: -- cgit v1.2.1