backportpackage: Unset DEBEMAIL when building source package.

Fixes error when building backports for packages with no Ubuntu changes. This
happens because Ubuntu has a policy of requiring that the Maintainer field of
Ubuntu-modified packages be set to an @ubuntu.com address. Normally this is a
warning, except when the uploader (determined by DEBEMAIL) is @ubuntu.com. In
that case it's an error and the source package build is aborted. We don't want
this behaviour for backports, so unset DEBEMAIL to make the error a warning
again.

LP: #1007042
This commit is contained in:
Iain Lane 2012-06-13 23:21:17 +01:00
parent e43486d4a1
commit 2861c54ad7
2 changed files with 6 additions and 1 deletions

View File

@ -322,7 +322,9 @@ def do_backport(workdir, pkg, suffix, close, release, release_pocket, build,
cmd.append('-sd') cmd.append('-sd')
if old_version: if old_version:
cmd.append('-v%s' % old_version) cmd.append('-v%s' % old_version)
check_call(cmd, cwd=srcdir) env = os.environ.copy()
del env['DEBEMAIL']
check_call(cmd, cwd=srcdir, env=env)
fn_base = pkg.source + '_' + bp_version.split(':', 1)[-1] fn_base = pkg.source + '_' + bp_version.split(':', 1)[-1]
changes = fn_base + '_source.changes' changes = fn_base + '_source.changes'

3
debian/changelog vendored
View File

@ -4,6 +4,9 @@ ubuntu-dev-tools (0.143) UNRELEASED; urgency=low
* backportpackage: Fix filenames searched when looking for existing * backportpackage: Fix filenames searched when looking for existing
.orig.tar.foo files (to determine if we need to upload it again or not). .orig.tar.foo files (to determine if we need to upload it again or not).
(LP: #1007908) (LP: #1007908)
* backportpackage: Unset DEBEMAIL when building source package. Fixes error
when building backports for packages with no Ubuntu changes. (LP:
#1007042)
[ Mathieu Trudel-Lapierre ] [ Mathieu Trudel-Lapierre ]
* mk-sbuild: use and update messages to suggest using the source:$chroot way * mk-sbuild: use and update messages to suggest using the source:$chroot way