Merge lp:~brian-murray/ubiquity/disable-upgrade into lp:ubiquity

Proposed by Brian Murray
Status: Merged
Approved by: Mathieu Trudel-Lapierre
Approved revision: 6610
Merged at revision: 6610
Proposed branch: lp:~brian-murray/ubiquity/disable-upgrade
Merge into: lp:ubiquity
Diff against target: 92 lines (+5/-34)
4 files modified
debian/changelog (+5/-0)
debian/ubiquity.templates (+0/-9)
tests/test_ubi_partman.py (+0/-11)
ubiquity/plugins/ubi-partman.py (+0/-14)
To merge this branch: bzr merge lp:~brian-murray/ubiquity/disable-upgrade
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve
Review via email: mp+343135@code.launchpad.net

Commit message

Drop the option to upgrade from an old release using ubiquity as it is crashing and leaves users in a broken state. (LP: #1756862)

To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Looks good, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2018-04-11 00:17:05 +0000
3+++ debian/changelog 2018-04-12 21:58:16 +0000
4@@ -1,9 +1,14 @@
5 ubiquity (18.04.6) UNRELEASED; urgency=medium
6
7+ [ Steve Langasek ]
8 * If we are running ubiquity-dm on VT1, we must conflict with
9 getty@getty1.service and not rely on some other display manager to do
10 this for us.
11
12+ [ Brian Murray ]
13+ * Drop the option to upgrade from an old release using ubiquity as it is
14+ crashing and leaves users in a broken state. (LP: #1756862)
15+
16 -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 10 Apr 2018 17:14:29 -0700
17
18 ubiquity (18.04.5) bionic; urgency=medium
19
20=== modified file 'debian/ubiquity.templates'
21--- debian/ubiquity.templates 2018-03-28 12:52:10 +0000
22+++ debian/ubiquity.templates 2018-04-12 21:58:16 +0000
23@@ -1326,15 +1326,6 @@
24 <span foreground="darkred">Warning:</span> This will delete all your
25 ${CURDISTRO} programs, documents, photos, music, and any other files.
26
27-Template: ubiquity/partitioner/ubuntu_upgrade
28-Type: text
29-#flag:comment:1
30-# CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
31-# VER is a variable substituted into this string, and may be '11.04'
32-_Description: Upgrade ${CURDISTRO} to ${VER}
33- Documents, music, and other personal files will be kept. Installed software
34- will be kept where possible. System-wide settings will be cleared.
35-
36 Template: ubiquity/partitioner/ubuntu_resize
37 Type: text
38 #flag:comment:1
39
40=== modified file 'tests/test_ubi_partman.py'
41--- tests/test_ubi_partman.py 2014-10-16 00:04:08 +0000
42+++ tests/test_ubi_partman.py 2018-04-12 21:58:16 +0000
43@@ -568,14 +568,6 @@
44 desc = self.page.extended_description(question)
45 use_device = ubi_partman.PartitioningOption(title, desc)
46
47- question = 'ubiquity/partitioner/ubuntu_upgrade'
48- question_has_variables(question, ['CURDISTRO', 'VER'])
49- self.page.db.subst(question, 'CURDISTRO', operating_system)
50- self.page.db.subst(question, 'VER', self.release.version)
51- title = self.page.description(question)
52- desc = self.page.extended_description(question)
53- reuse = ubi_partman.PartitioningOption(title, desc)
54-
55 operating_systems, ubuntu_systems = \
56 self.page.calculate_operating_systems(layout)
57 options = self.page.calculate_autopartitioning_options(
58@@ -590,9 +582,6 @@
59 self.assertIn('manual', options)
60 self.assertCountEqual(self.manual, options['manual'])
61
62- self.assertIn('reuse', options)
63- self.assertCountEqual(reuse, options['reuse'])
64-
65 # 'This computer currently has Ubuntu 12.04 on it.'
66 def test_same_ubuntu_only(self):
67 operating_system = 'Ubuntu 12.04'
68
69=== modified file 'ubiquity/plugins/ubi-partman.py'
70--- ubiquity/plugins/ubi-partman.py 2018-03-09 10:25:11 +0000
71+++ ubiquity/plugins/ubi-partman.py 2018-04-12 21:58:16 +0000
72@@ -2077,20 +2077,6 @@
73 desc = self.extended_description(q)
74 return PartitioningOption(title, desc)
75
76- if current_version <= new_version:
77- # "Windows (or Mac, ...) and an older version of Ubuntu are
78- # present" case
79-
80- # Only allow reuse with newer install media
81- # also block reuse when invalid version number or codename
82-
83- q = 'ubiquity/partitioner/ubuntu_upgrade'
84- self.db.subst(q, 'CURDISTRO', ubuntu)
85- self.db.subst(
86- q, 'VER', "%s %s" % (release.name, release.version))
87- title = self.description(q)
88- desc = self.extended_description(q)
89- return PartitioningOption(title, desc)
90 return None
91
92 def calculate_autopartitioning_heading(self, operating_systems,

Subscribers

People subscribed via source and target branches

to status/vote changes: