From aa99618dd6f9ccb7e71250f4c27f9613ab4bbd3c Mon Sep 17 00:00:00 2001
From: Stefano Rivera <stefanor@ubuntu.com>
Date: Tue, 16 Aug 2011 01:17:25 +0200
Subject: [PATCH] backportpackage: Backport from local source packages again
 (LP: #801945)

---
 debian/changelog       | 1 +
 ubuntutools/archive.py | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 516ac3c..86390cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ubuntu-dev-tools (0.128) UNRELEASED; urgency=low
 
   [ Stefano Rivera ]
   * ubuntutools.builder: Detect missing builder and fail early.
+  * backportpackage: Backport from local source packages again (LP: #801945)
 
   [ Julian Taylor ]
   * lp-shell: use ipython shell if available
diff --git a/ubuntutools/archive.py b/ubuntutools/archive.py
index 2f90416..f54c4dd 100644
--- a/ubuntutools/archive.py
+++ b/ubuntutools/archive.py
@@ -101,7 +101,7 @@ class SourcePackage(object):
     Use DebianSourcePackage or UbuntuSourcePackage instead of using this
     directly.
     """
-    distribution = 'unknown'
+    distribution = None
 
     def __init__(self, package=None, version=None, component=None,
                  dscfile=None, lp=None, mirrors=(), workdir='.'):
@@ -124,8 +124,9 @@ class SourcePackage(object):
         # Mirrors
         self._dsc_source = dscfile
         self.mirrors = list(mirrors)
-        self.masters = [UDTConfig.defaults['%s_MIRROR'
-                                           % self.distribution.upper()]]
+        if self.distribution:
+            self.masters = [UDTConfig.defaults['%s_MIRROR'
+                                               % self.distribution.upper()]]
         if dscfile is not None:
             if self.source is None:
                 self.source = 'unknown'