Merge lp:~ursinha/ubuntu-archive-tools/proposed-component-mismatches into lp:ubuntu-archive-tools

[Ursula Junque]

These changes make component-mismatches consider all pertinent pockets depending on the pocket we want to run it against. This is required to check -proposed correctly, considering release+updates+security+proposed packages.

For component-mismatches to work accordingly in this case, we need to run germinate against release plus the pockets we want, and use these germinated files to feed it.

[Colin Watson (cjwatson)]

Thanks, this looks good. Sorry for my delay in reviewing this.

review: Approve

=== modified file 'component-mismatches'
--- component-mismatches	2012-12-13 14:50:11 +0000
+++ component-mismatches	2013-03-20 22:27:23 +0000
@@ -71,19 +71,24 @@
 
 
 def read_current_source(options):
-    for component in options.all_components:
-        sources_path = "%s/dists/%s/%s/source/Sources.gz" % (
-            options.archive_dir, options.suite, component)
-        for section in apt_pkg.TagFile(decompress_open(sources_path)):
-            if 'Package' in section and 'Version' in section:
-                (pkg, version) = (section['Package'], section['Version'])
-                if pkg not in archive_source:
-                    archive_source[pkg] = (version, component)
-                else:
-                    if apt_pkg.VersionCompare(
-                            archive_source[pkg][0], version) < 0:
-                        archive_source[pkg] = (
-                            version, component.split("/")[0])
+    for pocket in options.pockets:
+        if pocket != options.suite:
+            suite = "%s-%s" % (options.suite, pocket)
+        else:
+            suite = options.suite
+        for component in options.all_components:
+            sources_path = "%s/dists/%s/%s/source/Sources.gz" % (
+                options.archive_dir, suite, component)
+            for section in apt_pkg.TagFile(decompress_open(sources_path)):
+                if 'Package' in section and 'Version' in section:
+                    (pkg, version) = (section['Package'], section['Version'])
+                    if pkg not in archive_source:
+                        archive_source[pkg] = (version, component)
+                    else:
+                        if apt_pkg.VersionCompare(
+                                archive_source[pkg][0], version) < 0:
+                            archive_source[pkg] = (
+                                version, component.split("/")[0])
 
     for pkg, (version, component) in archive_source.items():
         if component in options.components:
@@ -95,24 +100,29 @@
     for component in options.all_components:
         components_with_di.append(component)
         components_with_di.append('%s/debian-installer' % component)
-    for component in components_with_di:
-        for arch in ["i386", "amd64", "powerpc", "armhf"]:
-            binaries_path = "%s/dists/%s/%s/binary-%s/Packages.gz" % (
-                options.archive_dir, options.suite, component, arch)
-            for section in apt_pkg.TagFile(decompress_open(binaries_path)):
-                if 'Package' in section and 'Version' in section:
-                    (pkg, version) = (section['Package'], section['Version'])
-                    if 'source' in section:
-                        src = section['Source']
-                    else:
-                        src = section['Package']
-                    if pkg not in archive_binary:
-                        archive_binary[pkg] = (
-                            version, component.split("/")[0], src)
-                    else:
-                        if apt_pkg.VersionCompare(
-                                archive_binary[pkg][0], version) < 0:
-                            archive_binary[pkg] = (version, component, src)
+    for pocket in options.pockets:
+        if options.suite != pocket:
+            suite = "%s-%s" % (options.suite, pocket)
+        else:
+            suite = options.suite
+        for component in components_with_di:
+            for arch in ["i386", "amd64", "powerpc", "armhf"]:
+                binaries_path = "%s/dists/%s/%s/binary-%s/Packages.gz" % (
+                    options.archive_dir, suite, component, arch)
+                for section in apt_pkg.TagFile(decompress_open(binaries_path)):
+                    if 'Package' in section and 'Version' in section:
+                        (pkg, version) = (section['Package'], section['Version'])
+                        if 'source' in section:
+                            src = section['Source']
+                        else:
+                            src = section['Package']
+                        if pkg not in archive_binary:
+                            archive_binary[pkg] = (
+                                version, component.split("/")[0], src)
+                        else:
+                            if apt_pkg.VersionCompare(
+                                    archive_binary[pkg][0], version) < 0:
+                                archive_binary[pkg] = (version, component, src)
 
     for pkg, (version, component, src) in archive_binary.items():
         if component in options.components:
@@ -495,9 +505,8 @@
 def do_source_diff(options):
     removed = []
     added = []
-    for pkg in current_source:
-        if pkg not in germinate_source:
-            removed.append(pkg)
+    removed = list(set(current_source.keys()).difference(
+                   set(germinate_source.keys())))
     for pkg in germinate_source:
         if (pkg not in current_source and
                 is_included_source(options, pkg) and
@@ -511,9 +520,8 @@
 def do_binary_diff(options):
     removed = []
     added = {}
-    for pkg in current_binary:
-        if pkg not in germinate_binary:
-            removed.append(pkg)
+    removed = list(set(current_binary.keys()).difference(
+                   set(germinate_binary.keys())))
     for pkg in germinate_binary:
         if (pkg not in current_binary and
                 is_included_binary(options, pkg) and
@@ -565,9 +573,24 @@
     options.components = options.component.split(',')
     options.all_components = ["main", "restricted", "universe", "multiverse"]
 
+    options.pockets = []
     if options.suite is None:
         options.suite = options.distro.current_series.name
 
+    # Considering all the packages to have a full installable suite. So:
+    # -updates = release + -updates
+    # -security = release + -updates + -security
+    # -proposed = release + updates + security + proposed
+    if "-" in options.suite:
+        options.suite, options.pocket = options.suite.split("-")
+        if options.pocket in ["updates", "security", "proposed"]:
+            options.pockets.append("updates")
+        if options.pocket in ["security", "proposed"]:
+            options.pockets.append("security")
+        if options.pocket in ["proposed"]:
+            options.pockets.append("proposed")
+    options.pockets.append(options.suite)
+
     if options.output_file is not None:
         sys.stdout = open('%s.new' % options.output_file, 'w')