[Treepkg-commits] r517 - trunk/recipes/gnupg

[scm-commit@wald.intevation.org]

Author: bricks
Date: 2011-05-31 10:58:13 +0200 (Tue, 31 May 2011)
New Revision: 517

Modified:
   trunk/recipes/gnupg/base.py
Log:
Always use Pbuilder to create sources for gnupg


Modified: trunk/recipes/gnupg/base.py
===================================================================
--- trunk/recipes/gnupg/base.py	2011-03-08 14:23:25 UTC (rev 516)
+++ trunk/recipes/gnupg/base.py	2011-05-31 08:58:13 UTC (rev 517)
@@ -67,7 +67,7 @@
         self.create_tarball(origtargz, self.work_dir,
                             os.path.basename(pkgbasedir))
 
-        changemsg = ("Update to SVN rev. %s" % (self.revision,))
+        changemsg = ("Update to rev. %s" % (self.revision,))
         self.copy_debian_directory(pkgbasedir, pkgbaseversion,
                                    changemsg)
 
@@ -130,6 +130,10 @@
         self.pkgbasename = None
         self.pkgbaseversion = None
         self.origtargz = None
+        origbuilder = self.track.builder
+        self.builder = PBuilder(origbuilder.builderconfig,
+                                origbuilder.root_cmd,
+                                origbuilder.release_signing_keyid)
 
     def copy_workingcopy(self, dest):
         treepkg.util.copytree(self.track.checkout_dir, dest)
@@ -155,7 +159,7 @@
 
         treepkg.util.ensure_directory(self.src_dir)
         treepkg.util.ensure_directory(self.log_dir)
-        self.track.builder.run_script([script_name],
+        self.builder.run_script([script_name],
                                       logfile=os.path.join(self.log_dir,
                                                            "tarball_log.txt"),
                                       bindmounts=[self.work_dir, self.src_dir])
@@ -181,7 +185,7 @@
         self.create_original_tarball()
         orig_dir = self.create_orig_dir()
 
-        changemsg = ("Update to SVN rev. %s" % (self.revision,))
+        changemsg = ("Update to rev. %s" % (self.revision,))
         self.copy_debian_directory(orig_dir, self.pkgbaseversion, changemsg)
 
         self.create_source_package(orig_dir, self.origtargz)