Merge lp:~jelmer/launchpad-buildd/correct-target-distribution into lp:launchpad-buildd

[Jelmer Vernooij]

Use the actual target distroseries name in changelog, rather than the same as the last entry.

This is the fix suggested by James Westby in bug 855479.

[Graham Binns (gmb)]

Hi Jelmer,

Thanks for this branch. I don't know enough about buildd to know whether or not the fact that you haven't added a test is a bad thing or a necessary evil. Can you enlighten me?

review: Needs Information

[Jelmer Vernooij (jelmer)]

Hi Graham,

Thanks for looking at this branch.

Am 29/11/11 11:52, schrieb Graham Binns:
> Review: Needs Information
>
> Hi Jelmer,
>
> Thanks for this branch. I don't know enough about buildd to know whether or not the fact that you haven't added a test is a bad thing or a necessary evil. Can you enlighten me?
We don't have any real tests for this code, although Martin (Pool) has
started looking at refactoring it so it can be more easily tested. When
we do, we will hopefully also be testing the exact invocation of "bzr
dailydeb".

A regression of this bug wouldn't be the worst thing in the world, it
just means a slightly incorrect debian/changelog file. We've lived with
it until now without problems.

Cheers,

Jelmer

[Graham Binns (gmb)]

Okay, thanks for the info. I'm happy for this to land.

review: Approve (code)

=== modified file 'buildrecipe'
--- buildrecipe	2011-11-18 02:02:34 +0000
+++ buildrecipe	2011-11-28 11:00:57 +0000
@@ -127,6 +127,7 @@
             '-Derror',
             'dailydeb', '--safe', '--no-build', recipe_path,
             self.tree_path, '--manifest', manifest_path,
+            '--distribution', self.distroseries_name,
             '--allow-fallback-to-native', '--append-version',
             '~%s1' % self.distroseries_name], env=env)
         if retcode != 0: