Mercurial > treepkg
changeset 329:e749fe36ece3
Revisions are now handled as strings
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Wed, 17 Mar 2010 14:29:22 +0000 |
| parents | dd2bd0ccd674 |
| children | 24db9223488b |
| files | treepkg/web.py |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/treepkg/web.py Wed Mar 17 14:26:16 2010 +0000 +++ b/treepkg/web.py Wed Mar 17 14:29:22 2010 +0000 @@ -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):