Merge lp:~mbp/udd/877827-blacklist into lp:udd

[Martin Pool]

This addresses bug 877827 by just giving a means to disable importing packages from particular distroseries. Obviously we don't want to do that too much, but in this case where the history is nonmonotonic, it's probably reasonable.

[James Westby (james-w)]

review: Approve

=== modified file 'pkgimport.conf'
--- pkgimport.conf	2011-12-15 17:58:06 +0000
+++ pkgimport.conf	2012-01-12 11:23:27 +0000
@@ -11,3 +11,8 @@
 [nexuiz-data]
 # More than 24h is necessary, let's try 3 days
 pi.max_duration=259200
+
+[openldap]
+# Version numbers stepped backwards; let's just not import the old ones.
+# See https://bugs.launchpad.net/udd/+bug/877827
+pi.blacklist_distro_releases = woody
 
=== modified file 'udd/iconfig.py'
--- udd/iconfig.py	2012-01-11 14:54:26 +0000
+++ udd/iconfig.py	2012-01-12 11:23:27 +0000
@@ -195,6 +195,11 @@
 register_option('pi.ubuntu_merges_dir', default='{pi.www_dir}/merges',
                 help='Merges against Ubuntu versions.')
 
+config.option_registry.register(
+    config.ListOption(
+        'pi.blacklist_distro_releases',
+        default=[],
+        help='Do not import from these distribution releases'))
 
 # Used by categorize_failures.py:
 register_option('pi.web_status_dir', default = '{pi.www_dir}/status',
 
=== modified file 'udd/scripts/import_package.py'
--- udd/scripts/import_package.py	2011-12-12 10:41:06 +0000
+++ udd/scripts/import_package.py	2012-01-12 11:23:27 +0000
@@ -657,7 +657,12 @@
     imported_suites = set()
     have_imported_old_debian = False
     last_target_info = None
+    config = iconfig.PackageStack(name, possible_transports)
     for importp in reversed(all_versions.plist):
+        if importp.release in config.get('pi.blacklist_distro_releases'):
+            trace.mutter('%s %s is blacklisted; skipping it' %
+                (name, importp.release))
+            continue
         suite = icommon.make_suite(importp.release, importp.pocket)
         if (importp.distro, suite) in imported_suites:
             continue