diff options
| -rwxr-xr-x | EasyInstall.txt | 2 | ||||
| -rwxr-xr-x | setuptools/package_index.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/EasyInstall.txt b/EasyInstall.txt index c8b726c4..f2734401 100755 --- a/EasyInstall.txt +++ b/EasyInstall.txt @@ -1104,6 +1104,8 @@ Release Notes/Change History * Fix ``sys.path_importer_cache`` not being updated when an existing zipfile or directory is deleted/overwritten. + * Fix not recognizing HTML 404 pages from package indexes. + 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 d13bfc0f..4c81580b 100755 --- a/setuptools/package_index.py +++ b/setuptools/package_index.py @@ -169,7 +169,7 @@ class PackageIndex(Environment): base = f.url # handle redirects page = f.read() f.close() - if url.startswith(self.index_url): + if url.startswith(self.index_url) and getattr(f,'code',None)!=404: page = self.process_index(url, page) for match in HREF.finditer(page): @@ -253,7 +253,7 @@ class PackageIndex(Environment): def scan_all(self, msg=None, *args): if self.index_url not in self.fetched_urls: if msg: self.warn(msg,*args) - self.warn( + self.info( "Scanning index of all packages (this may take a while)" ) self.scan_url(self.index_url) |