Merge ~brian-murray/ubiquity:remove-apt-clone into ubiquity:master

[Brian Murray]

This removes the feature "keep installed software" when reinstalling Ubuntu as it is broken and has been for quite a long time. Additionally, even were it to work it would likely only keep a small subset of software the user has installed and subsequently would provide a bad user experience.

I'm sure I got everything but it's possible I may have removed too much so take a careful look.

[Michael Hudson-Doyle (mwhudson)]

This looks good, it seems to me that you've removed enough but not too much. Two little comments.

(I haven't tested this btw)

review: Approve

[Brian Murray (brian-murray)]

Thanks for the feedback. I'll make one of the changes you suggested. Incidentally, how could I go about testing my ubiquity changes?

[Michael Hudson-Doyle (mwhudson)]

> Thanks for the feedback. I'll make one of the changes you suggested.

Thanks. Your comments make sense to me.

> Incidentally, how could I go about testing my ubiquity changes?

The usual way I do it is build my branch into debs (locally or in a ppa), boot into "try mode", install the new debs, then run ubiquity (or "ubiquity --debug") in a terminal.

[Jean-Baptiste Lallement (jibel)]

I built the package and tested your patch. Nothing to report. Reinstallation as described in the bug attached works fine.

Regarding the MP, there is just one update missing in ubiquity.templates cf comments inline.

review: Needs Fixing

[Brian Murray (brian-murray)]

> I built the package and tested your patch. Nothing to report. Reinstallation
> as described in the bug attached works fine.
>
> Regarding the MP, there is just one update missing in ubiquity.templates cf
> comments inline.

Thanks for testing this, I've updated ubiquity.templates.

review: Needs Resubmitting

diff --git a/debian/changelog b/debian/changelog
index 739798c..828aa0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,18 @@
 ubiquity (20.10.10) UNRELEASED; urgency=medium
 
+<<<<<<< debian/changelog
   [ Didier Roche ]
   [ Jean-Baptiste Lallement ]
   * AD integration for GTK UI.
 
  -- Jean-Baptiste Lallement <[e-mail]>  Tue, 25 Aug 2020 10:06:29 +0200
+=======
+  * 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)
+
+ -- Brian Murray <[e-mail]>  Wed, 02 Sep 2020 11:39:49 -0700
+>>>>>>> debian/changelog
 
 ubiquity (20.10.9) groovy; urgency=medium
 
diff --git a/debian/control b/debian/control
index 4c9c8dc..50f4599 100644
--- a/debian/control
+++ b/debian/control
@@ -77,7 +77,6 @@ Vcs-Browser: https://code.launchpad.net/~ubuntu-installer/ubiquity/+git/ubiquity
 Package: ubiquity
 Architecture: any
 Depends: adduser,
-         apt-clone,
          cryptsetup,
          dbus-x11,
          dpkg-repack,
diff --git a/debian/ubiquity.templates b/debian/ubiquity.templates
index eb6d724..248716a 100644
--- a/debian/ubiquity.templates
+++ b/debian/ubiquity.templates
@@ -656,6 +656,7 @@ Template: ubiquity/install/bootloader
 Type: text
 _Description: Configuring boot loader...
 
+<<<<<<< debian/ubiquity.templates
 Template: ubiquity/install/activedirectory
 Type: text
 _Description: Configuring Active Directory...
@@ -668,6 +669,8 @@ Template: ubiquity/install/apt_clone_restore
 Type: text
 _Description: Restoring previously installed packages...
 
+=======
+>>>>>>> debian/ubiquity.templates
 Template: ubiquity/install/installing
 Type: text
 _Description: Installing additional packages...
@@ -767,6 +770,7 @@ _Description: Error copying bluetooth configuration
  continue, but the bluetooth configuration will have to be set up again in the
  installed system.
 
+<<<<<<< debian/ubiquity.templates
 Template: ubiquity/install/broken_apt_clone
 Type: error
 _Description: Error restoring installed applications
@@ -782,6 +786,8 @@ _Description: Error configuring connection to Active Directory
  <a href="https://discourse.ubuntu.com/t/service-sssd/11579">ubuntu.com/activedirectory</a>
  for help.
 
+=======
+>>>>>>> debian/ubiquity.templates
 Template: ubiquity/install/md5_check
 Type: boolean
 Default: true
@@ -1397,7 +1403,7 @@ Type: text
 # CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
 _Description: Reinstall ${CURDISTRO}
  Documents, music, and other personal files will be kept. Installed software
- will be kept where possible. System-wide settings will be cleared.
+ and system-wide settings will be cleared.
 
 Template: ubiquity/partitioner/multiple_os_format
 Type: text
@@ -1650,6 +1656,7 @@ _Description:
 Template: ubiquity/zfs_keystore_key
 Type: password
 _Description: Key to secure the keystore on ZFS installations
+<<<<<<< debian/ubiquity.templates
 
 Template: ubiquity/login_use_directory
 Type: text
@@ -1718,3 +1725,5 @@ _Description: That name already exists on the network.
 Template: ubiquity/text/domain_connection_error
 Type: text
 _Description: Failed to connect to domain.
+=======
+>>>>>>> debian/ubiquity.templates
diff --git a/gui/gtk/stepPartAsk.ui b/gui/gtk/stepPartAsk.ui
index 01b70e6..8159d06 100644
--- a/gui/gtk/stepPartAsk.ui
+++ b/gui/gtk/stepPartAsk.ui
@@ -207,7 +207,7 @@
                     <property name="margin_left">24</property>
                     <property name="xalign">0</property>
                     <property name="yalign">0</property>
-                    <property name="label" translatable="yes">&lt;span size="small"&gt;Documents, music, and other personal files will be kept. Installed software will be kept where possible. System-wide settings will be cleared.&lt;/span&gt;</property>
+                    <property name="label" translatable="yes">&lt;span size="small"&gt;Documents, music, and other personal files will be kept. Installed software and system-wide settings will be cleared.&lt;/span&gt;</property>
                     <property name="use_markup">True</property>
                     <property name="wrap">True</property>
                   </object>
diff --git a/partman/finish.d/_numbers b/partman/finish.d/_numbers
index 4ea14a2..6b9ef8a 100644
--- a/partman/finish.d/_numbers
+++ b/partman/finish.d/_numbers
@@ -1,2 +1 @@
-01 apt_clone_save
 01 remove_os_prober_cache
diff --git a/partman/finish.d/apt_clone_save b/partman/finish.d/apt_clone_save
 deleted file mode 100755
index bca5e3d..0000000
--- a/partman/finish.d/apt_clone_save
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-set -e
-
-. /lib/partman/lib/base.sh
-
-mountpoint="$(mktemp -d)"
-root=
-var=
-
-fail () {
-	if [ -n "$var" ] && [ -e "$mountpoint/var" ]; then
-		umount "$mountpoint/var" || true
-	fi
-	if [ -e "$mountpoint" ]; then
-		umount "$mountpoint" && rmdir "$mountpoint" || true
-	fi
-	db_progress STOP
-	# TODO input an error question.
-	exit 1
-}
-
-for dev in $DEVICES/*; do
-	[ -d "$dev" ] || continue
-	cd $dev
-	open_dialog PARTITIONS
-	while { read_line num id size type fs path name; [ "$id" ]; }; do
-		[ -f "$id/method" ] || continue
-		[ -f "$id/use_filesystem" ] || continue
-		[ -f "$id/mountpoint" ] || continue
-		[ "$fs" != free ] || continue
-		[ -f "$id/format" ] && continue
-		[ -f "$id/formatted" ] && continue
-		if [ "$(cat "$id/mountpoint")" = "/" ]; then
-			root="$path"
-		elif [ "$(cat "$id/mountpoint")" = "/var" ]; then
-			var="$path"
-		fi
-	done
-	close_dialog
-done
-
-if [ -z "$root" ]; then
-	# The partition is going to be formatted; there's nothing to preserve.
-	exit 0
-fi
-
-db_progress START 0 1 ubiquity/install/title
-db_progress INFO ubiquity/install/apt_clone_save
-
-mount "$root" "$mountpoint"
-[ -n "$var" ] && mount "$var" "$mountpoint/var"
-
-working="$mountpoint/ubiquity-apt-clone"
-
-mkdir -p "$working"
-if ! apt-clone clone --with-dpkg-repack --source "$mountpoint" "$working"; then
-	# TODO: if the above fails, ask a debconf error question.
-	fail
-fi
-
-db_progress STEP 1
-
-if [ -n "$var" ] && [ -e "$mountpoint/var" ]; then
-	umount "$mountpoint/var" || true
-fi
-if [ -e "$mountpoint" ]; then
-	umount "$mountpoint" && rmdir "$mountpoint" || true
-fi
-
-db_progress STOP
diff --git a/scripts/plugininstall.py b/scripts/plugininstall.py
index 434fd3b..48e7491 100755
--- a/scripts/plugininstall.py
+++ b/scripts/plugininstall.py
@@ -251,17 +251,6 @@ class Install(install_misc.InstallBase):
         if 'UBIQUITY_OEM_USER_CONFIG' not in os.environ:
             self.install_restricted_extras()
 
-        self.db.progress('INFO', 'ubiquity/install/apt_clone_restore')
-        try:
-            self.apt_clone_restore()
-        except Exception:
-            syslog.syslog(
-                syslog.LOG_WARNING,
-                'Could not restore packages from the previous install:')
-            for line in traceback.format_exc().split('\n'):
-                syslog.syslog(syslog.LOG_WARNING, line)
-            self.db.input('critical', 'ubiquity/install/broken_apt_clone')
-            self.db.go()
         try:
             self.copy_network_config()
         except Exception:
@@ -1579,31 +1568,6 @@ class Install(install_misc.InstallBase):
                 for line in installed:
                     print(line, file=fp)
 
-    def apt_clone_restore(self):
-        if 'UBIQUITY_OEM_USER_CONFIG' in os.environ:
-            return
-        import lsb_release
-        working = self.target_file('ubiquity-apt-clone')
-        working = os.path.join(working,
-                               'apt-clone-state-%s.tar.gz' % os.uname()[1])
-        codename = lsb_release.get_distro_information()['CODENAME']
-        if not os.path.exists(working):
-            return
-        install_misc.chroot_setup(self.target)
-        binds = ("/proc", "/sys", "/dev", "/run")
-        try:
-            for bind in binds:
-                misc.execute('mount', '--bind', bind, self.target + bind)
-            restore_cmd = [
-                'apt-clone', 'restore-new-distro',
-                working, codename, '--destination', self.target]
-            subprocess.check_call(
-                restore_cmd, preexec_fn=install_misc.debconf_disconnect)
-        finally:
-            install_misc.chroot_cleanup(self.target)
-            for bind in binds:
-                misc.execute('umount', '-f', self.target + bind)
-
     def copy_network_config(self):
         if 'UBIQUITY_OEM_USER_CONFIG' in os.environ:
             return
@@ -1774,12 +1738,6 @@ class Install(install_misc.InstallBase):
                     print(oem_id, file=oem_id_file)
         except (debconf.DebconfError, IOError):
             pass
-        try:
-            path = self.target_file('ubiquity-apt-clone')
-            if os.path.exists(path):
-                shutil.move(path, self.target_file('var/log/installer'))
-        except IOError:
-            pass
 
     def save_random_seed(self):
         """Save random seed to the target system.