Mercurial > treepkg
changeset 241:df3065e4c76b
Include the rules revision in the output of listpendingnotifications.py
and adapt sendnotificationmails.py and notification-template.txt
accordingly
| author | Bernhard Herzog <bh@intevation.de> |
|---|---|
| date | Wed, 14 Jan 2009 17:20:42 +0000 |
| parents | 58cf7e6b7cca |
| children | 351427b28b76 |
| files | bin/listpendingnotifications.py bin/sendnotificationmails.py notification-template.txt |
| diffstat | 3 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/bin/listpendingnotifications.py Wed Jan 14 17:08:51 2009 +0000 +++ b/bin/listpendingnotifications.py Wed Jan 14 17:20:42 2009 +0000 @@ -1,5 +1,5 @@ #! /usr/bin/python2.4 -# Copyright (C) 2008 by Intevation GmbH +# Copyright (C) 2008, 2009 by Intevation GmbH # Authors: # Bernhard Herzog <bh@intevation.de> # @@ -20,8 +20,9 @@ for track in group.get_package_tracks(): for revision in track.get_revisions(): if revision.status.notification_mail.name == "notification_pending": - print "%s %s %d" % (revision.status.status.name, - track.name, revision.revision) + print "%s %s %d %d" % (revision.status.status.name, + track.name, revision.revision, + revision.rules_revision) revision.status.notification_sent()
--- a/bin/sendnotificationmails.py Wed Jan 14 17:08:51 2009 +0000 +++ b/bin/sendnotificationmails.py Wed Jan 14 17:20:42 2009 +0000 @@ -1,5 +1,5 @@ #! /usr/bin/python2.4 -# Copyright (C) 2008 by Intevation GmbH +# Copyright (C) 2008, 2009 by Intevation GmbH # Authors: # Bernhard Herzog <bh@intevation.de> # @@ -61,8 +61,8 @@ **config)) for line in lines.splitlines(): words = line.split() - if len(words) == 3: - status, track, revision = words + if len(words) == 4: + status, track, revision, rules_revision = words values = config.copy() values.update(locals()) send_mail(config, template % values)
--- a/notification-template.txt Wed Jan 14 17:08:51 2009 +0000 +++ b/notification-template.txt Wed Jan 14 17:20:42 2009 +0000 @@ -9,7 +9,7 @@ an error occurred while building the %(track)s packages for revision %(revision)s. Details are available in the build log: - http://example.com/treepkg/%(track)s/%(revision)s/build_log.txt + http://example.com/treepkg/%(track)s/%(revision)s-%(rules_revision)s/build_log.txt General information about the status of the packages is available at