launchpad-reviewers team mailing list archive

[Colin Watson <mp+429988@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:fakepackager-avoid-debuild into launchpad:master.

Commit message:
Use dpkg-buildpackage directly, not debuild

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/429988

The `debuild` wrapper for `dpkg-buildpackage` does various extra things that make it more pleasant for interactive use.  However, for non-interactive use such as when building fake packages during the test suite, those extra things just slow us down without providing any benefit: in particular, there's no point in running `lintian` on our test packages.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:fakepackager-avoid-debuild into launchpad:master.

diff --git a/lib/lp/soyuz/doc/fakepackager.rst b/lib/lp/soyuz/doc/fakepackager.rst
index d7137c1..e9b20d0 100644
--- a/lib/lp/soyuz/doc/fakepackager.rst
+++ b/lib/lp/soyuz/doc/fakepackager.rst
@@ -168,7 +168,7 @@ changelog matters in the test context.
     >>> packager.buildSource(include_orig=False)
 
 The generated changesfile contains a valid signature done by the
-preset GPG key. All the job is done by `debuild` here, we are
+preset GPG key. All the job is done by `dpkg-buildpackage` here; we are
 basically checking we pass the right arguments to it.
 
     >>> changesfile_path = packager.listAvailableUploads()[1]
diff --git a/lib/lp/soyuz/tests/fakepackager.py b/lib/lp/soyuz/tests/fakepackager.py
index 8894280..a42cefe 100644
--- a/lib/lp/soyuz/tests/fakepackager.py
+++ b/lib/lp/soyuz/tests/fakepackager.py
@@ -386,24 +386,24 @@ class FakePackager:
             os.path.basename(self.upstream_directory)
         )
 
-        debuild_options = ["--no-conf", "-S"]
+        dpkg_buildpackage_options = ["-S"]
 
         if not signed:
-            debuild_options.extend(["-uc", "-us"])
+            dpkg_buildpackage_options.extend(["-uc", "-us"])
         else:
             assert (
                 self.gpg_key_fingerprint is not None
             ), "Cannot build signed packages because the key is not set."
-            debuild_options.append("-k%s" % self.gpg_key_fingerprint)
-            debuild_options.append("-p%s" % get_gpg_path())
+            dpkg_buildpackage_options.append("-k%s" % self.gpg_key_fingerprint)
+            dpkg_buildpackage_options.append("-p%s" % get_gpg_path())
 
         if include_orig:
-            debuild_options.append("-sa")
+            dpkg_buildpackage_options.append("-sa")
 
         current_path = os.getcwd()
         os.chdir(self.upstream_directory)
 
-        self._runSubProcess("debuild", debuild_options)
+        self._runSubProcess("dpkg-buildpackage", dpkg_buildpackage_options)
 
         os.chdir(current_path)