[Treepkg-commits] r255 - trunk/treepkg

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2010-03-17 15:29:22 +0100 (Wed, 17 Mar 2010)
New Revision: 255

Modified:
   trunk/treepkg/web.py
Log:
Revisions are now handled as strings


Modified: trunk/treepkg/web.py
===================================================================
--- trunk/treepkg/web.py	2010-03-17 14:26:16 UTC (rev 254)
+++ trunk/treepkg/web.py	2010-03-17 14:29:22 UTC (rev 255)
@@ -38,8 +38,8 @@
 
     def determine_log_filename(self, package_track_name, revdir, log_basename):
         """Returns the name of a log file of a revision if it exists"""
-        if re.match("(?P<revno>[0-9]+)-(?P<rulesrev>[0-9]+)$", revdir):
-            revno, rulesrev = map(int, revdir.split("-"))
+        if re.match("(?P<revno>[0-9a-f]+)-(?P<rulesrev>[0-9a-f]+)$", revdir):
+            revno, rulesrev = map(str, revdir.split("-"))
         group = report.get_packager_group(self.treepkg_config)
         for track in group.get_package_tracks():
             if track.name == package_track_name:
@@ -82,7 +82,7 @@
             trackdir = os.path.join(destdir, track.name)
             for revision in track.get_revisions():
                 revdir = os.path.join(trackdir,
-                                      "%d-%d" % (revision.revision,
+                                      "%s-%s" % (revision.revision,
                                                  revision.rules_revision))
                 if revision.has_build_log():
                     if not os.path.isdir(trackdir):