aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2014-02-07 21:30:21 -0500
committerJason R. Coombs <jaraco@jaraco.com>2014-02-07 21:30:21 -0500
commit6ec75de342e8fd954c830e0df832691262af77ce (patch)
treeb90f26847e88a902080062a36dbd31033ca03eb5
parented2b58f7db37491f8ffa83c7dafbdb4b5b2ddbb4 (diff)
parent379096d8a1e4be86f8b2e36a0ec66fa75e2edbb8 (diff)
downloadexternal_python_setuptools-6ec75de342e8fd954c830e0df832691262af77ce.tar.gz
external_python_setuptools-6ec75de342e8fd954c830e0df832691262af77ce.tar.bz2
external_python_setuptools-6ec75de342e8fd954c830e0df832691262af77ce.zip
Merged in menghan/setuptools (pull request #30)
Setuptools now honors all dependency_links and not just the first one that was supplied.
-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 0e51b72c..167c34e5 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -582,8 +582,9 @@ class PackageIndex(Environment):
if local_index is not None:
dist = dist or find(requirement, local_index)
- if dist is None and self.to_scan is not None:
- self.prescan()
+ if dist is None:
+ if self.to_scan is not None:
+ self.prescan()
dist = find(requirement)
if dist is None and not force_scan: