[Python-checkins] r50552 - in sandbox/branches/setuptools-0.6: EasyInstall.txt setuptools/package_index.py

[phillip.eby]

Author: phillip.eby
Date: Mon Jul 10 23:55:25 2006
New Revision: 50552

Modified:
   sandbox/branches/setuptools-0.6/EasyInstall.txt
   sandbox/branches/setuptools-0.6/setuptools/package_index.py
Log:
Fix not recognizing HTML 404 pages from package indexes.
(backport from trunk)


Modified: sandbox/branches/setuptools-0.6/EasyInstall.txt
==============================================================================
--- sandbox/branches/setuptools-0.6/EasyInstall.txt	(original)
+++ sandbox/branches/setuptools-0.6/EasyInstall.txt	Mon Jul 10 23:55:25 2006
@@ -1104,6 +1104,8 @@
  * 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``.

Modified: sandbox/branches/setuptools-0.6/setuptools/package_index.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/package_index.py	(original)
+++ sandbox/branches/setuptools-0.6/setuptools/package_index.py	Mon Jul 10 23:55:25 2006
@@ -169,7 +169,7 @@
         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 @@
     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)