[Treepkg-commits] r96 - in trunk: test treepkg

[scm-commit@wald.intevation.org]

Author: bh
Date: 2008-06-23 18:12:01 +0200 (Mon, 23 Jun 2008)
New Revision: 96

Modified:
   trunk/test/mocksudopbuilder.py
   trunk/test/test_builder.py
   trunk/treepkg/builder.py
Log:
Add "--debbuildopts -b" to "pbuilder build" command line to stop
pbuilder from creating a source package.  The .changes would otherwise
contain references to that new source package instead of the one we
passed to pbuilder. The checksums for the two source packages would be
different so the .changes file would not match the source package that
treepkg produces.


Modified: trunk/test/mocksudopbuilder.py
===================================================================
--- trunk/test/mocksudopbuilder.py	2008-06-23 13:21:08 UTC (rev 95)
+++ trunk/test/mocksudopbuilder.py	2008-06-23 16:12:01 UTC (rev 96)
@@ -1,5 +1,5 @@
 #! /usr/bin/env python
-# Copyright (C) 2007 by Intevation GmbH
+# Copyright (C) 2007, 2008 by Intevation GmbH
 # Authors:
 # Bernhard Herzog <bh at intevation.de>
 #
@@ -44,6 +44,7 @@
     parser.add_option("--configfile")
     parser.add_option("--logfile")
     parser.add_option("--buildresult")
+    parser.add_option("--debbuildopts")
 
     opts, rest = parser.parse_args(args)
     return opts, rest

Modified: trunk/test/test_builder.py
===================================================================
--- trunk/test/test_builder.py	2008-06-23 13:21:08 UTC (rev 95)
+++ trunk/test/test_builder.py	2008-06-23 16:12:01 UTC (rev 96)
@@ -162,6 +162,7 @@
                                  '--configfile', 'my_pbuilderrc',
                                  '--logfile', 'the_logfile',
                                  '--buildresult', binary_dir_name,
+                                 '--debbuildopts', '-b',
                                  'my_dsc_file'])
         self.failUnless(os.path.isdir(binary_dir_name))
 
@@ -183,6 +184,7 @@
                                  '--bindmounts', "/home/builder/pbuilder",
                                  '--logfile', 'the_logfile',
                                  '--buildresult', binary_dir_name,
+                                 '--debbuildopts', '-b',
                                  'my_dsc_file'])
         self.failUnless(os.path.isdir(binary_dir_name))
 
@@ -203,6 +205,7 @@
                                  '--extrapackages', "texinfo",
                                  '--logfile', 'the_logfile',
                                  '--buildresult', binary_dir_name,
+                                 '--debbuildopts', '-b',
                                  'my_dsc_file'])
         self.failUnless(os.path.isdir(binary_dir_name))
 
@@ -225,6 +228,7 @@
                                  '--configfile', 'my_pbuilderrc',
                                  '--logfile', 'the_logfile',
                                  '--buildresult', binary_dir_name,
+                                 '--debbuildopts', '-b',
                                  'my_dsc_file'])
         self.failUnless(os.path.isdir(binary_dir_name))
         self.failUnless(os.path.exists(env_test_file))

Modified: trunk/treepkg/builder.py
===================================================================
--- trunk/treepkg/builder.py	2008-06-23 13:21:08 UTC (rev 95)
+++ trunk/treepkg/builder.py	2008-06-23 16:12:01 UTC (rev 96)
@@ -124,7 +124,8 @@
             args.extend(["--extrapackages", pkg])
         run.call(cmdexpand("@rootcmd /usr/sbin/pbuilder build"
                            " --configfile $pbuilderrc @args"
-                           " --logfile $logfile --buildresult $bindir $dsc",
+                           " --logfile $logfile --buildresult $bindir"
+                           " --debbuildopts -b $dsc",
                            rootcmd=self.root_cmd, pbuilderrc=self.pbuilderrc,
                            logfile=logfile, bindir=binary_dir, dsc=dsc_file,
                            args=args),