Merge ~jibel/ubiquity/+git/ubiquity:lp1845593_fix_removed_section_attribute into ubiquity:master

Proposed by Jean-Baptiste Lallement on 2019-09-27
Status: Merged
Merged at revision: 28e140b0ffaabf3dc8bf9ade99462b472fa6efd8
Proposed branch: ~jibel/ubiquity/+git/ubiquity:lp1845593_fix_removed_section_attribute
Merge into: ubiquity:master
Diff against target: 42 lines (+11/-2)
3 files modified
debian/changelog (+7/-0)
scripts/install.py (+2/-1)
scripts/plugininstall.py (+2/-1)
Reviewer Review Type Date Requested Status
Iain Lane 2019-09-27 Approve on 2019-09-27
Julian Andres Klode (community) Approve on 2019-09-27
Review via email: mp+373302@code.launchpad.net

Commit message

Fix crash with free software only installation

scripts/install.py: Replaced removed property Package.section by Version.section (LP: #1845593)

To post a comment you must log in.
Julian Andres Klode (juliank) wrote :

Are we sure a candidate exists? I guess so, since there should not be any negative pins during installation, so approval from the python-apt side :)

review: Approve
Jean-Baptiste Lallement (jibel) wrote :

Patch tested on a fresh installation of Eoan Desktop 20190926.1

Iain Lane (laney) wrote :

thanks a lot :>

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index a29c7d9..39b8442 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+ubiquity (19.10.13) eoan; urgency=medium
7+
8+ * scripts/install.py: Replaced removed property Package.section by
9+ Version.section (LP: #1845593)
10+
11+ -- Jean-Baptiste Lallement <jean-baptiste.lallement@ubuntu.com> Fri, 27 Sep 2019 09:44:57 +0200
12+
13 ubiquity (19.10.12) eoan; urgency=medium
14
15 * ubiquity-dm: Still start gsd-xsettings for non-gnome-shell desktops.
16diff --git a/scripts/install.py b/scripts/install.py
17index 6848ed8..85e9922 100755
18--- a/scripts/install.py
19+++ b/scripts/install.py
20@@ -265,7 +265,8 @@ class Install(install_misc.InstallBase):
21 if not use_restricted:
22 for pkg in cache.keys():
23 if (cache[pkg].is_installed and
24- cache[pkg].section.startswith('restricted/')):
25+ cache[pkg].candidate.section.startswith(
26+ 'restricted/')):
27 difference.add(pkg)
28
29 # Keep packages we explicitly installed.
30diff --git a/scripts/plugininstall.py b/scripts/plugininstall.py
31index 93f852f..8292444 100755
32--- a/scripts/plugininstall.py
33+++ b/scripts/plugininstall.py
34@@ -1414,7 +1414,8 @@ class Install(install_misc.InstallBase):
35 cache = self.restricted_cache
36 for pkg in cache.keys():
37 if (cache[pkg].is_installed and
38- cache[pkg].section.startswith('restricted/')):
39+ cache[pkg].candidate.section.startswith(
40+ 'restricted/')):
41 difference.add(pkg)
42 del cache
43

Subscribers

People subscribed via source and target branches