[Python-checkins] r50550 - sandbox/trunk/setuptools/setuptools/package_index.py

[phillip.eby]

Author: phillip.eby
Date: Mon Jul 10 23:54:12 2006
New Revision: 50550

Modified:
   sandbox/trunk/setuptools/setuptools/package_index.py
Log:
Fix not recognizing HTML 404 pages from package indexes.


Modified: sandbox/trunk/setuptools/setuptools/package_index.py
==============================================================================
--- sandbox/trunk/setuptools/setuptools/package_index.py	(original)
+++ sandbox/trunk/setuptools/setuptools/package_index.py	Mon Jul 10 23:54:12 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)