[Treepkg-commits] r495 - trunk/treepkg

[scm-commit@wald.intevation.org]

Author: bricks
Date: 2010-12-22 17:44:04 +0100 (Wed, 22 Dec 2010)
New Revision: 495

Modified:
   trunk/treepkg/packager.py
Log:
add more substituteable variables for changelog message


Modified: trunk/treepkg/packager.py
===================================================================
--- trunk/treepkg/packager.py	2010-11-22 11:26:06 UTC (rev 494)
+++ trunk/treepkg/packager.py	2010-12-22 16:44:04 UTC (rev 495)
@@ -56,6 +56,14 @@
 
     def __init__(self, parent):
         self.parent = parent
+        self.rules_revision = self.parent.rules_revision
+        self.pkg_revision = self.parent.pkg_revision
+        self.short_revision = self.revision
+        if len(self.pkg_revision) > 7:
+            self.short_revision = self.short_revision[:7]
+        localtime = time.localtime()
+        self.pkg_date = time.strftime("%Y%m%d", localtime)
+        self.pkg_time = time.strftime("%H%M", localtime)
 
     def determine_upstream_version(self, directory=None):
         """
@@ -113,14 +121,11 @@
                                 determine_upstream_version. Default: "0"
         """
         revision = self.revision
-        rules_revision = self.parent.rules_revision
-        pkg_revision = self.parent.pkg_revision
-        short_revision = revision
-        if len(pkg_revision) > 7:
-            short_revision = short_revision[:7]
-        localtime = time.localtime()
-        pkg_date = time.strftime("%Y%m%d", localtime)
-        pkg_time = time.strftime("%H%M", localtime)
+        rules_revision = self.rules_revision
+        pkg_revision = self.pkg_revision
+        short_revision = self.short_revision
+        pkg_date = self.pkg_date
+        pkg_time = self.pkg_time
         upstream_version = self.determine_upstream_version(directory)
         version_dict = locals().copy()
         if additionals:
@@ -304,7 +309,9 @@
         self.move_source_package(pkgbasename)
 
     def get_change_msg(self):
-        return self.changemsg_template % dict(revision=self.revision)
+        return self.changemsg_template % dict(revision=self.revision, 
+                pkg_date=self.pkg_date, pkg_time=self.pkg_time,
+                rules_revision=self.rules_revision)
 
 class BinaryPackager(object):