From c1eac4b0a9ca43c678ed0238d5f94e46b51e8e11 Mon Sep 17 00:00:00 2001
From: Evan Broder <evan@ebroder.net>
Date: Thu, 23 Jun 2011 17:55:14 -0700
Subject: [PATCH] Save the UDTConfig object and use it to find a default
 mirror.

---
 backportpackage | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/backportpackage b/backportpackage
index e4a21f6..b87ed88 100755
--- a/backportpackage
+++ b/backportpackage
@@ -142,7 +142,7 @@ def parse(args):
     if not opts.upload and not opts.workdir:
         parser.error('Please specify either a working dir or an upload target!')
 
-    return opts, args
+    return opts, args, config
 
 def get_current_version(package, distribution, source_release):
     info = vendor_to_distroinfo(distribution)
@@ -161,7 +161,7 @@ def get_current_version(package, distribution, source_release):
     return latest_version
 
 def find_release_package(launchpad, mirror, workdir, package, version,
-                         source_release):
+                         source_release, config):
     srcpkg = None
 
     if source_release:
@@ -171,7 +171,9 @@ def find_release_package(launchpad, mirror, workdir, package, version,
             error('Unknown release codename %s' % source_release)
     else:
         distribution = system_distribution()
-    mirrors = (mirror,) if mirror else ()
+    mirrors = [mirror] if mirror else []
+
+    mirrors.append(config.get_value('%s_MIRROR' % distribution.upper()))
 
     if not version:
         version = get_current_version(package, distribution, source_release)
@@ -195,7 +197,8 @@ def find_release_package(launchpad, mirror, workdir, package, version,
 
     return srcpkg
 
-def find_package(launchpad, mirror, workdir, package, version, source_release):
+def find_package(launchpad, mirror, workdir, package, version, source_release,
+                 config):
     "Returns the SourcePackage"
     if package.endswith('.dsc'):
         return SourcePackage(version=version, dscfile=package,
@@ -207,7 +210,7 @@ def find_package(launchpad, mirror, workdir, package, version, source_release):
         source_release = info().devel()
 
     srcpkg = find_release_package(launchpad, mirror, workdir, package, version,
-                                  source_release)
+                                  source_release, config)
     if version and srcpkg.version != version:
         error('Requested backport of version %s but version of %s in %s is %s'
               % (version, package, source_release, srcpkg.version))
@@ -286,7 +289,7 @@ def do_backport(workdir, pkg, suffix, release, build, builder, update, upload,
 def main(args):
     ubu_email()
 
-    opts, (package_or_dsc,) = parse(args[1:])
+    opts, (package_or_dsc,), config = parse(args[1:])
 
     script_name = os.path.basename(sys.argv[0])
     launchpad = Launchpad.login_anonymously(script_name, opts.lpinstance)
@@ -312,7 +315,8 @@ def main(args):
                            workdir,
                            package_or_dsc,
                            opts.version,
-                           opts.source_release)
+                           opts.source_release,
+                           config)
         pkg.pull()
 
         for release in opts.dest_releases: