# HG changeset patch
# User Bernhard Herzog <bh@intevation.de>
# Date 1214237521 0
# Node ID c0ea6cbb0fd26f9e78f08bf8240ebefe136c8101
# Parent  bfcb2bbf9a5277193c42901339f5967a7cb100ef
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.

diff -r bfcb2bbf9a52 -r c0ea6cbb0fd2 test/mocksudopbuilder.py
--- a/test/mocksudopbuilder.py	Mon Jun 23 13:21:08 2008 +0000
+++ b/test/mocksudopbuilder.py	Mon Jun 23 16:12:01 2008 +0000
@@ -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@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
diff -r bfcb2bbf9a52 -r c0ea6cbb0fd2 test/test_builder.py
--- a/test/test_builder.py	Mon Jun 23 13:21:08 2008 +0000
+++ b/test/test_builder.py	Mon Jun 23 16:12:01 2008 +0000
@@ -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))
diff -r bfcb2bbf9a52 -r c0ea6cbb0fd2 treepkg/builder.py
--- a/treepkg/builder.py	Mon Jun 23 13:21:08 2008 +0000
+++ b/treepkg/builder.py	Mon Jun 23 16:12:01 2008 +0000
@@ -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),