Merge ~jibel/ubiquity:remove_popcon into ubiquity:master

[Jean-Baptiste Lallement]

popularity-contest is not shipped anymore, remove it from the installer.

[Iain Lane (laney)]

I'm good with this, but I'm guessing since we don't ship popcon anywhere currently we were always getting into the exception handler already?

Previously any flavour could enable popcon by seeding it, this will break that, but I think it's OK since the server is not maintained.

Please pull --rebase before pushing. I can't do that at my end because that will mean LP loses track of the merge.

review: Approve

[Jean-Baptiste Lallement (jibel)]

Thanks for the review.

Yes, that was the case, and on Ubuntu it generates systematically an error in the logs, thats how I noticed it.

diff --git a/debian/changelog b/debian/changelog
index 9049fe9..577573f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ubiquity (20.10.11) UNRELEASED; urgency=medium
+
+  * Remove popularity-contest.
+
+ -- Jean-Baptiste Lallement <[e-mail]>  Thu, 17 Sep 2020 08:00:35 +0200
+
 ubiquity (20.10.10) groovy; urgency=medium
 
   [ Didier Roche ]
@@ -5,7 +11,7 @@ ubiquity (20.10.10) groovy; urgency=medium
   * AD integration for GTK UI.
   * bump KDE_SESSION_VERSION to 5 to fix xdg-open on Kubuntu (LP: #1890173)
 
-  [ Brian Murray ]
+  [Brian Murray]
   * Do not try to keep installed software when reinstalling Ubuntu as the
     process was error prone (LP: 1152399) and did not provide a quailty
     experience. (LP: #1798369)
diff --git a/scripts/plugininstall.py b/scripts/plugininstall.py
index 48e7491..acfe9d0 100755
--- a/scripts/plugininstall.py
+++ b/scripts/plugininstall.py
@@ -784,15 +784,6 @@ class Install(install_misc.InstallBase):
             script += '-oem'
         misc.execute(script)
 
-        osextras.unlink_force(self.target_file('etc/popularity-contest.conf'))
-        try:
-            participate = self.db.get('popularity-contest/participate')
-            install_misc.set_debconf(
-                self.target, 'popularity-contest/participate', participate,
-                self.db)
-        except debconf.DebconfError:
-            pass
-
         osextras.unlink_force(self.target_file('etc/papersize'))
         subprocess.call(['log-output', '-t', 'ubiquity', 'chroot', self.target,
                          'ucf', '--purge', '/etc/papersize'],
@@ -824,7 +815,6 @@ class Install(install_misc.InstallBase):
             pass
 
         packages = ['linux-image-' + self.kernel_version,
-                    'popularity-contest',
                     'libpaper1',
                     'ssl-cert']
         arch, subarch = install_misc.archdetect()
diff --git a/ubiquity/i18n.py b/ubiquity/i18n.py
index 8b6bf6e..d7f6555 100644
--- a/ubiquity/i18n.py
+++ b/ubiquity/i18n.py
@@ -102,7 +102,6 @@ def get_translations(languages=None, core_names=[], extra_prefixes=[]):
             'partman-target/no_root',
             'partman-target/text/method',
             'grub-installer/bootdev',
-            'popularity-contest/participate',
         ))
         prefixes = reduce(lambda x, y: x + '|' + y, extra_prefixes, prefixes)