Merge lp:~laney/ubuntu-dev-tools/debuild-no-debemail-1007042 into lp:~ubuntu-dev/ubuntu-dev-tools/trunk

[Iain Lane]

I don't know if this is the most pythonic way of achieving this, but I think it's what we want to do.

[Stefano Rivera (stefanor)]

Pythonic enough for me (it's how I'd solve the problem).

review: Approve

[Evan Broder (broder)]

Looks fine to me

review: Approve

=== modified file 'backportpackage'
--- backportpackage	2012-06-02 19:34:20 +0000
+++ backportpackage	2012-06-13 22:24:22 +0000
@@ -322,7 +322,9 @@
         cmd.append('-sd')
     if 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]
     changes = fn_base + '_source.changes'

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-06 13:55:08 +0000
+++ debian/changelog	2012-06-13 22:24:22 +0000
@@ -4,6 +4,9 @@
   * backportpackage: Fix filenames searched when looking for existing
     .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)
 
   [ Mathieu Trudel-Lapierre ]
   * mk-sbuild: use and update messages to suggest using the source:$chroot way