[cig-commits] r5241 - cs/merlin/branches/v1/merlin/archimedes

[leif at geodynamics.org]

Author: leif
Date: 2006-11-10 16:42:58 -0800 (Fri, 10 Nov 2006)
New Revision: 5241

Modified:
   cs/merlin/branches/v1/merlin/archimedes/__init__.py
Log:
Minor fix in archimedes egg-filename-parsing.


Modified: cs/merlin/branches/v1/merlin/archimedes/__init__.py
===================================================================
--- cs/merlin/branches/v1/merlin/archimedes/__init__.py	2006-11-11 00:31:07 UTC (rev 5240)
+++ cs/merlin/branches/v1/merlin/archimedes/__init__.py	2006-11-11 00:42:58 UTC (rev 5241)
@@ -74,10 +74,12 @@
     candidateMap = {}
     for egg in glob(os.path.join(to_dir, "*.egg")):
         basename = os.path.basename(egg)
-        name, version = basename[:-4].split('-')
-        if name == "merlin" and version.startswith(branch + "."):
-            candidates.append(basename)
-            candidateMap[basename] = egg
+        t = basename[:-4].split('-')
+        if len(t) == 2:
+            name, version = t
+            if name == "merlin" and version.startswith(branch + "."):
+                candidates.append(basename)
+                candidateMap[basename] = egg
     
     if candidates:
         candidates.sort()
@@ -118,10 +120,12 @@
                 basename = urllib2.unquote(path.split('/')[-1])
                 if '#' in basename: basename, fragment = basename.split('#',1)
                 if basename.endswith('.egg') and '-' in basename:
-                    name, version = basename[:-4].split('-')
-                    if name == "merlin" and version.startswith(branch + "."):
-                        candidates.append(basename)
-                        candidateMap[basename] = link
+                    t = basename[:-4].split('-')
+                    if len(t) == 2:
+                        name, version = t
+                        if name == "merlin" and version.startswith(branch + "."):
+                            candidates.append(basename)
+                            candidateMap[basename] = link
 
             if not candidates:
                 print >>sys.stderr, (