[or-cvs] r22166: {projects} Versions in packdir are bad, don't use them (projects/gettor/lib/gettor)

[Christian Fromme]

Author: kaner
Date: 2010-04-10 09:34:47 +0000 (Sat, 10 Apr 2010)
New Revision: 22166

Modified:
   projects/gettor/lib/gettor/packages.py
Log:
Versions in packdir are bad, don't use them


Modified: projects/gettor/lib/gettor/packages.py
===================================================================
--- projects/gettor/lib/gettor/packages.py	2010-04-10 04:10:35 UTC (rev 22165)
+++ projects/gettor/lib/gettor/packages.py	2010-04-10 09:34:47 UTC (rev 22166)
@@ -204,7 +204,13 @@
                         file = gettor.utils.renameExe(file)
                     except:
                         log.error("Could not rename exe file")
-                zsplitfile = splitfile + ".z"
+                match = re.match(".*(part[0-9][0-9].*$)", splitfile)
+                if match:
+                    partNo = match.group(1)
+                else:
+                    log.error("Can't happen: No part string in %s" % splitfile)
+                    continue
+                zsplitfile = pack + "." + partNo + ".z"
                 zipFileName = os.path.join(packSplitDir, zsplitfile)
                 if gettor.utils.hasExe(zipFileName):
                     try: