diff options
| -rwxr-xr-x | EasyInstall.txt | 3 | ||||
| -rwxr-xr-x | setuptools/package_index.py | 26 |
2 files changed, 16 insertions, 13 deletions
diff --git a/EasyInstall.txt b/EasyInstall.txt index 1d44bcdc..beb823a6 100755 --- a/EasyInstall.txt +++ b/EasyInstall.txt @@ -1209,6 +1209,9 @@ Release Notes/Change History ``rel="homepage"`` or ``rel="download"``, without needing the old PyPI-specific visible markup. + * Suppressed warning message about possibly-misspelled project name, if an egg + or link for that project name has already been seen. + 0.6b3 * Fix local ``--find-links`` eggs not being copied except with ``--always-copy``. diff --git a/setuptools/package_index.py b/setuptools/package_index.py index 5bd08f8a..525f0e73 100755 --- a/setuptools/package_index.py +++ b/setuptools/package_index.py @@ -308,11 +308,7 @@ class PackageIndex(Environment): if not self.package_pages.get(requirement.key): # We couldn't find the target package, so search the index page too - self.warn( - "Couldn't find index page for %r (maybe misspelled?)", - requirement.unsafe_name - ) - self.scan_all() + self.not_found_in_index(requirement) for url in list(self.package_pages.get(requirement.key,())): # scan each page that might be related to the desired package @@ -326,6 +322,10 @@ class PackageIndex(Environment): self.debug("%s does not match %s", requirement, dist) return super(PackageIndex, self).obtain(requirement,installer) + + + + def check_md5(self, cs, info, filename, tfp): if re.match('md5=[0-9a-f]{32}$', info): self.debug("Validating md5 checksum for %s", filename) @@ -358,14 +358,14 @@ class PackageIndex(Environment): map(self.scan_url, self.to_scan) self.to_scan = None # from now on, go ahead and process immediately - - - - - - - - + def not_found_in_index(self, requirement): + if self[requirement.key]: # we've seen at least one distro + meth, msg = self.info, "Couldn't retrieve index page for %r" + else: # no distros seen for this name, might be misspelled + meth, msg = (self.warn, + "Couldn't find index page for %r (maybe misspelled?)") + meth(msg, requirement.unsafe_name) + self.scan_all() def download(self, spec, tmpdir): """Locate and/or download `spec` to `tmpdir`, returning a local path |