# HG changeset patch
# User Bernhard Herzog <bh@intevation.de>
# Date 1231953642 0
# Node ID df3065e4c76b3a350c8a50348f5ebe084c965d23
# Parent  58cf7e6b7cca1f4fea5a8ac821d3cf3be33f1155
Include the rules revision in the output of listpendingnotifications.py
and adapt sendnotificationmails.py and notification-template.txt
accordingly

diff -r 58cf7e6b7cca -r df3065e4c76b bin/listpendingnotifications.py
--- 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()
 
 
diff -r 58cf7e6b7cca -r df3065e4c76b bin/sendnotificationmails.py
--- 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)
diff -r 58cf7e6b7cca -r df3065e4c76b notification-template.txt
--- 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