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

[Brian Murray]

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

[Mathieu Trudel-Lapierre (cyphermox)]

Looks good, thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2018-04-11 00:17:05 +0000
+++ debian/changelog	2018-04-12 21:58:16 +0000
@@ -1,9 +1,14 @@
 ubiquity (18.04.6) UNRELEASED; urgency=medium
 
+  [ Steve Langasek ]
   * If we are running ubiquity-dm on VT1, we must conflict with
     [e-mail] and not rely on some other display manager to do
     this for us.
 
+  [ Brian Murray ]
+  * Drop the option to upgrade from an old release using ubiquity as it is
+    crashing and leaves users in a broken state. (LP: #1756862)
+
  -- Steve Langasek <[e-mail]>  Tue, 10 Apr 2018 17:14:29 -0700
 
 ubiquity (18.04.5) bionic; urgency=medium
 
=== modified file 'debian/ubiquity.templates'
--- debian/ubiquity.templates	2018-03-28 12:52:10 +0000
+++ debian/ubiquity.templates	2018-04-12 21:58:16 +0000
@@ -1326,15 +1326,6 @@
  <span foreground="darkred">Warning:</span> This will delete all your
  ${CURDISTRO} programs, documents, photos, music, and any other files.
 
-Template: ubiquity/partitioner/ubuntu_upgrade
-Type: text
-#flag:comment:1
-# CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-# VER is a variable substituted into this string, and may be '11.04'
-_Description: Upgrade ${CURDISTRO} to ${VER}
- Documents, music, and other personal files will be kept. Installed software
- will be kept where possible. System-wide settings will be cleared.
-
 Template: ubiquity/partitioner/ubuntu_resize
 Type: text
 #flag:comment:1
 
=== modified file 'tests/test_ubi_partman.py'
--- tests/test_ubi_partman.py	2014-10-16 00:04:08 +0000
+++ tests/test_ubi_partman.py	2018-04-12 21:58:16 +0000
@@ -568,14 +568,6 @@
         desc = self.page.extended_description(question)
         use_device = ubi_partman.PartitioningOption(title, desc)
 
-        question = 'ubiquity/partitioner/ubuntu_upgrade'
-        question_has_variables(question, ['CURDISTRO', 'VER'])
-        self.page.db.subst(question, 'CURDISTRO', operating_system)
-        self.page.db.subst(question, 'VER', self.release.version)
-        title = self.page.description(question)
-        desc = self.page.extended_description(question)
-        reuse = ubi_partman.PartitioningOption(title, desc)
-
         operating_systems, ubuntu_systems = \
             self.page.calculate_operating_systems(layout)
         options = self.page.calculate_autopartitioning_options(
@@ -590,9 +582,6 @@
         self.assertIn('manual', options)
         self.assertCountEqual(self.manual, options['manual'])
 
-        self.assertIn('reuse', options)
-        self.assertCountEqual(reuse, options['reuse'])
-
     # 'This computer currently has Ubuntu 12.04 on it.'
     def test_same_ubuntu_only(self):
         operating_system = 'Ubuntu 12.04'
 
=== modified file 'ubiquity/plugins/ubi-partman.py'
--- ubiquity/plugins/ubi-partman.py	2018-03-09 10:25:11 +0000
+++ ubiquity/plugins/ubi-partman.py	2018-04-12 21:58:16 +0000
@@ -2077,20 +2077,6 @@
                     desc = self.extended_description(q)
                     return PartitioningOption(title, desc)
 
-                if current_version <= new_version:
-                    # "Windows (or Mac, ...) and an older version of Ubuntu are
-                    # present" case
-
-                    # Only allow reuse with newer install media
-                    # also block reuse when invalid version number or codename
-
-                    q = 'ubiquity/partitioner/ubuntu_upgrade'
-                    self.db.subst(q, 'CURDISTRO', ubuntu)
-                    self.db.subst(
-                        q, 'VER', "%s %s" % (release.name, release.version))
-                    title = self.description(q)
-                    desc = self.extended_description(q)
-                    return PartitioningOption(title, desc)
         return None
 
     def calculate_autopartitioning_heading(self, operating_systems,