Merge lp:~jelmer/launchpad-buildd/dpkg-buildpackage-sa into lp:launchpad-buildd

[Jelmer Vernooij]

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.

[Martin Pool (mbp)]

This looks good... couldn't including the source sometimes cause the
ppa upload to be rejected though, if that tarball is already present?
Or I guess ppas will tolerate that as long as the contents are the
same.

It may fail but probably less often.

[William Grant (wgrant)]

review: Approve (code)

[Jelmer Vernooij (jelmer)]

> This looks good... couldn't including the source sometimes cause the
> ppa upload to be rejected though, if that tarball is already present?
> Or I guess ppas will tolerate that as long as the contents are the
> same.
>
> It may fail but probably less often.
The checksum is verified in all other situations too - the .dsc file that is generated by dpkg-source includes the orig tarball's checksum, regardless of whether it is included in the upload.

Not including the orig tarball does save some bandwidth in the normal case, but that shouldn't really be relevant inside of the data center.

=== 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 <[e-mail]>  Fri, 11 Nov 2011 14:43:31 +0100