launchpad-reviewers team mailing list archive

[Jelmer Vernooij <jelmer@xxxxxxxxx>]

Jelmer Vernooij has proposed merging lp:~jelmer/launchpad/buildrecipe-allow-fallback-to-native into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #885497 in Launchpad itself: "fails to find orig.tar for package built from daily recipe"
  https://bugs.launchpad.net/launchpad/+bug/885497

For more details, see:
https://code.launchpad.net/~jelmer/launchpad/buildrecipe-allow-fallback-to-native/+merge/81271

Pass --allow-fallback-to-native to "bzr dailydeb".

At the moment, Launchpad runs a version of bzr-builder that converts *all*
non-native source packages to native packages.

Newer versions of bzr-builder support properly building non-native packages too,
and by default no longer convert non-native packages to native packages.
Instead, bzr-builder actually attempts to build a propery native package.

Since building a native package requires an orig tarball, most of the
existing builds on Launchpad can't actually be built as a non-native package.
And because they're daily builds, it makes more sense to build them as
a native package too. The reason some try to build a non-native is
because they inherit their packaging data from Debian or Ubuntu packages.

Passing --allow-fallback-to-native makes bzr dailydeb keep the old
behaviour of converting non-native packages to native packages,
but only if no upstream tarball was found.

This will need to be deployed together with the new version of bzr-builder,
which is already available in the cat archive,
as old versions don't have the --allow-fallback-to-native option.
-- 
https://code.launchpad.net/~jelmer/launchpad/buildrecipe-allow-fallback-to-native/+merge/81271
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jelmer/launchpad/buildrecipe-allow-fallback-to-native into lp:launchpad.

=== modified file 'lib/canonical/buildd/buildrecipe'
--- lib/canonical/buildd/buildrecipe	2011-11-02 01:14:15 +0000
+++ lib/canonical/buildd/buildrecipe	2011-11-04 13:11:27 +0000
@@ -123,7 +123,8 @@
         retcode = call_report_rusage([
             'bzr', 'dailydeb', '--safe', '--no-build', recipe_path,
             self.tree_path, '--manifest', manifest_path,
-            '--append-version', '~%s1' % self.distroseries_name], env=env)
+            '--allow-fallback-to-native', '--append-version',
+            '~%s1' % self.distroseries_name], env=env)
         if retcode != 0:
             return retcode
         (source,) = [name for name in os.listdir(self.tree_path)