launchpad-dev team mailing list archive

[Jelmer Vernooij <jelmer@xxxxxxxxx>]

Jelmer Vernooij has proposed merging lp:~jelmer/launchpad-buildd/dpkg-buildpackage-sa into lp:launchpad-buildd.

Requested reviews:
  Launchpad Development mailing list (launchpad-dev)
Related bugs:
  Bug #891892 in Launchpad Auto Build System: "[buildrecipe] should unconditionally include upstream source tarball"
  https://bugs.launchpad.net/launchpad-buildd/+bug/891892

For more details, see:
https://code.launchpad.net/~jelmer/launchpad-buildd/dpkg-buildpackage-sa/+merge/82623

Unconditionally include the orig tarball with a recipe build source upload.

By default, dpkg-buildpackage looks at the changelog and checks if there were older entries with the same upstream version beyond the current version [1]. If it finds older entries with the same upstream version, it doesn't bother including the orig tarball again - presumably because the archive already has it.

The -sa argument overrides this behaviour and makes dpkg-source always include the orig tarballs.

This makes it easier to upload recipe builds to PPAs even if there are previous entries in the same changelog that haven't been uploaded to that PPA.

[1] technically, beyond what is in the .changes file - but buildrecipe doesn't use -v.
-- 
https://code.launchpad.net/~jelmer/launchpad-buildd/dpkg-buildpackage-sa/+merge/82623
Your team Launchpad Development mailing list is requested to review the proposed merge of lp:~jelmer/launchpad-buildd/dpkg-buildpackage-sa into lp:launchpad-buildd.

=== modified file 'buildrecipe'
--- buildrecipe	2011-11-11 12:19:38 +0000
+++ buildrecipe	2011-11-18 01:17:33 +0000
@@ -179,7 +179,8 @@
         :return: a retcode from dpkg-buildpackage.
         """
         retcode = self.chroot([
-            'su', '-c', 'cd %s && /usr/bin/dpkg-buildpackage -i -I -us -uc -S'
+            'su', '-c',
+            'cd %s && /usr/bin/dpkg-buildpackage -i -I -us -uc -S -sa'
             % self.source_dir_relative, self.username])
         for filename in os.listdir(self.tree_path):
             path = os.path.join(self.tree_path, filename)

=== modified file 'debian/changelog'
--- debian/changelog	2011-11-16 18:19:07 +0000
+++ debian/changelog	2011-11-18 01:17:33 +0000
@@ -5,6 +5,8 @@
     already created at init-time.
   * Remove unnecessary debian/launchpad-buildd.conffiles. debhelper
     already adds the required conffiles.
+  * In buildrecipe, pass -sa to dpkg-buildpackage so the orig tarball(s)
+    always get included. LP: #891892
 
  -- Jelmer Vernooij <jelmer@xxxxxxxxxxxxx>  Fri, 11 Nov 2011 14:43:31 +0100