From 605b27a5503bb4e753e9c7b845ba6652e0c94c25 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Wed, 20 Jun 2012 22:44:12 +0200 Subject: [PATCH] submittodebian; Unset DEBEMAIL when building source package. (LP: #1015066) --- debian/changelog | 6 ++++-- submittodebian | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index fb06f69..eed8b54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,8 @@ ubuntu-dev-tools (0.143) UNRELEASED; urgency=low .orig.tar.foo files (to determine if we need to upload it again or not). (LP: #1007908) * backportpackage: Unset DEBEMAIL when building source package. Fixes error - when building backports for packages with no Ubuntu changes. (LP: - #1007042) + when building backports for packages with no Ubuntu changes. + (LP: #1007042) [ Mathieu Trudel-Lapierre ] * mk-sbuild: use and update messages to suggest using the source:$chroot way @@ -28,6 +28,8 @@ ubuntu-dev-tools (0.143) UNRELEASED; urgency=low data cached (LP: #1008783) * ubuntutools.archive: Improve error handling around rmadison calls (LP: #1010951) + * submittodebian; Unset DEBEMAIL when building source package. + (LP: #1015066) -- Mathieu Trudel-Lapierre Wed, 06 Jun 2012 09:53:24 -0400 diff --git a/submittodebian b/submittodebian index 4ec6c18..719fb5c 100755 --- a/submittodebian +++ b/submittodebian @@ -75,7 +75,10 @@ def build_source_package(): cmd = ['bzr', 'bd', '-S', '--', '-uc', '-us', '-nc'] else: cmd = ['debuild', '-S', '-uc', '-us', '-nc'] - check_call(cmd) + env = os.environ.copy() + # Unset DEBEMAIL in case there's an @ubuntu.com e-mail address + env.pop('DEBEMAIL', None) + check_call(cmd, env=env) def gen_debdiff(tmpdir, changelog):