Merge lp:~laney/ubiquity/package-removal-arch into lp:ubiquity

[Iain Lane]

When looking at manifest-*, discard arch qualifiers. Packages are recorded without those, so we need to compare without them too.

[Mathieu Trudel-Lapierre (cyphermox)]

review: Approve

[Mathieu Trudel-Lapierre (cyphermox)]

I can't reproduce the fix; even just reproducing the bug is tricky.

It looks fine, but it doesn't seem to fix things.

review: Needs Fixing

[lp:~laney/ubiquity/package-removal-arch]

6338. By Mathieu Trudel-Lapierre on 2015-10-19

Automatic update of included source packages: console-setup
1.108ubuntu8, localechooser 2.65ubuntu2.

6339. By Mathieu Trudel-Lapierre on 2015-10-19

d-i/patches/localechooser-post-base-installer.patch: update patch for
new languagelist format.

6340. By Mathieu Trudel-Lapierre on 2015-10-19

Set a height_request property for the details extender (the thing you can
click to get syslog from the ubiquity slideshow window). (LP: #1507330)

6341. By Mathieu Trudel-Lapierre on 2015-10-19

releasing package ubiquity version 2.21.34

6342. By Mathieu Trudel-Lapierre on 2015-10-19

scripts/plugininstall.py: Ignore ':arch' in package names when deciding
which packages to keep after installing. We keep track of installed
packages without arch, so should remove it when doing this comparison.
(LP: #1503297)

[Mathieu Trudel-Lapierre (cyphermox)]

I'm bad, this is fine.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-10-01 21:28:45 +0000
+++ debian/changelog	2015-10-13 16:11:12 +0000
@@ -1,3 +1,12 @@
+ubiquity (2.21.34) UNRELEASED; urgency=medium
+
+  * scripts/plugininstall.py: Ignore ':arch' in package names when deciding
+    which packages to keep after installing. We keep track of installed
+    packages without arch, so should remove it when doing this comparison.
+    (LP: #1503297)
+
+ -- Iain Lane <[e-mail]>  Tue, 13 Oct 2015 16:46:04 +0100
+
 ubiquity (2.21.33) wily; urgency=medium
 
   * Automatic update of included source packages: tzsetup 1:0.66ubuntu2.

=== modified file 'scripts/plugininstall.py'
--- scripts/plugininstall.py	2014-12-21 05:57:59 +0000
+++ scripts/plugininstall.py	2015-10-13 16:11:12 +0000
@@ -1418,24 +1418,28 @@
             with open(manifest_remove) as manifest_file:
                 for line in manifest_file:
                     if line.strip() != '' and not line.startswith('#'):
-                        difference.add(line.split()[0])
+                        pkg = line.split(':')[0]
+                        difference.add(pkg.split()[0])
             live_packages = set()
             with open(manifest) as manifest_file:
                 for line in manifest_file:
                     if line.strip() != '' and not line.startswith('#'):
-                        live_packages.add(line.split()[0])
+                        pkg = line.split(':')[0]
+                        live_packages.add(pkg.split()[0])
             desktop_packages = live_packages - difference
         elif os.path.exists(manifest_desktop) and os.path.exists(manifest):
             desktop_packages = set()
             with open(manifest_desktop) as manifest_file:
                 for line in manifest_file:
                     if line.strip() != '' and not line.startswith('#'):
-                        desktop_packages.add(line.split()[0])
+                        pkg = line.split(':')[0]
+                        desktop_packages.add(pkg.split()[0])
             live_packages = set()
             with open(manifest) as manifest_file:
                 for line in manifest_file:
                     if line.strip() != '' and not line.startswith('#'):
-                        live_packages.add(line.split()[0])
+                        pkg = line.split(':')[0]
+                        live_packages.add(pkg.split()[0])
             difference = live_packages - desktop_packages
         else:
             difference = set()