[Treepkg-commits] r207 - trunk/treepkg

[scm-commit@wald.intevation.org]

Author: bh
Date: 2009-08-04 12:01:56 +0200 (Tue, 04 Aug 2009)
New Revision: 207

Modified:
   trunk/treepkg/packager.py
Log:
Pass the package revision as a parameter to the RevisionPackager


Modified: trunk/treepkg/packager.py
===================================================================
--- trunk/treepkg/packager.py	2009-08-03 18:57:27 UTC (rev 206)
+++ trunk/treepkg/packager.py	2009-08-04 10:01:56 UTC (rev 207)
@@ -41,6 +41,7 @@
 
     track = _fromparent("track")
     revision = _fromparent("revision")
+    pkg_revision = _fromparent("pkg_revision")
     status = _fromparent("status")
     log_dir = _fromparent("log_dir")
     work_dir = _fromparent("work_dir")
@@ -143,7 +144,7 @@
             oldversionprefix = oldversion.split(":")[0] + ":"
         else:
             oldversionprefix = ""
-        debrev = self.track.debrevision_prefix + "1"
+        debrev = self.pkg_revision
         run.call(cmdexpand("debchange -c  $changelog"
                            " -v ${oldversionprefix}${pkgbaseversion}-${debrev}"
                            " $changemsg", **locals()),
@@ -245,10 +246,16 @@
     source_packager_cls = SourcePackager
     binary_packager_cls = BinaryPackager
 
-    def __init__(self, track, revision, rules_revision, tag=""):
+    def __init__(self, track, revision, rules_revision, pkg_revision=None,
+                 tag=""):
         self.track = track
         self.revision = revision
         self.rules_revision = rules_revision
+
+        if pkg_revision is None:
+            pkg_revision = self.track.debrevision_prefix + "1"
+        self.pkg_revision = pkg_revision
+
         self.base_dir = self.track.pkg_dir_for_revision(self.revision,
                                                         rules_revision)
         self.status = status.RevisionStatus(os.path.join(self.base_dir,