Merge ~jibel/ubiquity:remove_popcon into ubiquity:master

Proposed by Jean-Baptiste Lallement
Status: Merged
Merged at revision: c1621984dafb405b0284303111962c35cc1480c8
Proposed branch: ~jibel/ubiquity:remove_popcon
Merge into: ubiquity:master
Diff against target: 62 lines (+7/-12)
3 files modified
debian/changelog (+7/-1)
scripts/plugininstall.py (+0/-10)
ubiquity/i18n.py (+0/-1)
Reviewer Review Type Date Requested Status
Iain Lane Approve
Review via email: mp+390882@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
Iain Lane (laney) wrote :

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
Revision history for this message
Jean-Baptiste Lallement (jibel) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index 9049fe9..577573f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
1ubiquity (20.10.11) UNRELEASED; urgency=medium
2
3 * Remove popularity-contest.
4
5 -- Jean-Baptiste Lallement <jean-baptiste.lallement@ubuntu.com> Thu, 17 Sep 2020 08:00:35 +0200
6
1ubiquity (20.10.10) groovy; urgency=medium7ubiquity (20.10.10) groovy; urgency=medium
28
3 [ Didier Roche ]9 [ Didier Roche ]
@@ -5,7 +11,7 @@ ubiquity (20.10.10) groovy; urgency=medium
5 * AD integration for GTK UI.11 * AD integration for GTK UI.
6 * bump KDE_SESSION_VERSION to 5 to fix xdg-open on Kubuntu (LP: #1890173)12 * bump KDE_SESSION_VERSION to 5 to fix xdg-open on Kubuntu (LP: #1890173)
713
8 [ Brian Murray ]14 [Brian Murray]
9 * Do not try to keep installed software when reinstalling Ubuntu as the15 * Do not try to keep installed software when reinstalling Ubuntu as the
10 process was error prone (LP: 1152399) and did not provide a quailty16 process was error prone (LP: 1152399) and did not provide a quailty
11 experience. (LP: #1798369)17 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):
784 script += '-oem'784 script += '-oem'
785 misc.execute(script)785 misc.execute(script)
786786
787 osextras.unlink_force(self.target_file('etc/popularity-contest.conf'))
788 try:
789 participate = self.db.get('popularity-contest/participate')
790 install_misc.set_debconf(
791 self.target, 'popularity-contest/participate', participate,
792 self.db)
793 except debconf.DebconfError:
794 pass
795
796 osextras.unlink_force(self.target_file('etc/papersize'))787 osextras.unlink_force(self.target_file('etc/papersize'))
797 subprocess.call(['log-output', '-t', 'ubiquity', 'chroot', self.target,788 subprocess.call(['log-output', '-t', 'ubiquity', 'chroot', self.target,
798 'ucf', '--purge', '/etc/papersize'],789 'ucf', '--purge', '/etc/papersize'],
@@ -824,7 +815,6 @@ class Install(install_misc.InstallBase):
824 pass815 pass
825816
826 packages = ['linux-image-' + self.kernel_version,817 packages = ['linux-image-' + self.kernel_version,
827 'popularity-contest',
828 'libpaper1',818 'libpaper1',
829 'ssl-cert']819 'ssl-cert']
830 arch, subarch = install_misc.archdetect()820 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=[]):
102 'partman-target/no_root',102 'partman-target/no_root',
103 'partman-target/text/method',103 'partman-target/text/method',
104 'grub-installer/bootdev',104 'grub-installer/bootdev',
105 'popularity-contest/participate',
106 ))105 ))
107 prefixes = reduce(lambda x, y: x + '|' + y, extra_prefixes, prefixes)106 prefixes = reduce(lambda x, y: x + '|' + y, extra_prefixes, prefixes)
108107

Subscribers

People subscribed via source and target branches