[cig-commits] r6777 - in cs/merlin/branches/v1: merlin merlin.egg-info

[leif at geodynamics.org]

Author: leif
Date: 2007-05-03 17:44:04 -0700 (Thu, 03 May 2007)
New Revision: 6777

Modified:
   cs/merlin/branches/v1/merlin.egg-info/SOURCES.txt
   cs/merlin/branches/v1/merlin/package_index.py
Log:
Fix for issue105 ("Cheetah __future__ problem with Python 2.5").
Merlin now scans the "Merlin Package Index" in addition to PyPI.


Modified: cs/merlin/branches/v1/merlin/package_index.py
===================================================================
--- cs/merlin/branches/v1/merlin/package_index.py	2007-05-04 00:23:50 UTC (rev 6776)
+++ cs/merlin/branches/v1/merlin/package_index.py	2007-05-04 00:44:04 UTC (rev 6777)
@@ -318,6 +318,8 @@
             # scan each page that might be related to the desired package
             self.scan_url(url)
 
+        self.scan_url("http://geodynamics.org/svn/cig/cs/merlin/branches/v1/pi.html")
+
     def obtain(self, requirement, installer=None):
         self.prescan(); self.find_packages(requirement)
         for dist in self[requirement.key]:

Modified: cs/merlin/branches/v1/merlin.egg-info/SOURCES.txt
===================================================================
--- cs/merlin/branches/v1/merlin.egg-info/SOURCES.txt	2007-05-04 00:23:50 UTC (rev 6776)
+++ cs/merlin/branches/v1/merlin.egg-info/SOURCES.txt	2007-05-04 00:44:04 UTC (rev 6777)
@@ -4,6 +4,7 @@
 easy_install.py
 ez_setup.py
 launcher.c
+pi.html
 pkg_resources.py
 pkg_resources.txt
 release.sh