Merge ubiquity:start-installing-after-ubi-timezone into ubiquity:master

[Iain Lane]

This is intended to fix https://bugs.launchpad.net/ubuntu/+source/ubiquity/+bug/1797579

I'd like review and independent testing, particularly of the new parallel db thing.

If possible it'd be good to get this into cosmic.

[Iain Lane (laney)]

Feel free to (force) push fixes to this branch and merge/upload - I probably won't be around much this weekend.

[Łukasz Zemczak (sil2100)]

Ok, tested this on both Ubuntu and Kubuntu installs and it seems to work as expected (my pl locale was properly set at the end and the right language-packs and firefox-locale- packages left on disk). I am not 100% sure of the parallel db parts since I don't have much context about those, but they *do* make some sense here.

We should just SHIP IT.

review: Approve

diff --git a/ubiquity/frontend/gtk_ui.py b/ubiquity/frontend/gtk_ui.py
index 88608ea..ccebf2a 100644
--- a/ubiquity/frontend/gtk_ui.py
+++ b/ubiquity/frontend/gtk_ui.py
@@ -239,6 +239,7 @@ class Wizard(BaseFrontend):
         self.finished_installing = False
         self.finished_pages = False
         self.parallel_db = None
+        self.parallel_db_install = None
         self.timeout_id = None
         self.screen_reader = False
         self.orca_process = None
@@ -1673,11 +1674,27 @@ class Wizard(BaseFrontend):
             dbfilter = partman_commit.PartmanCommit(self, db=self.parallel_db)
             dbfilter.start(auto_process=True)
 
-        # FIXME OH DEAR LORD.  Use isinstance.
-        elif finished_step == 'ubiquity.components.partman_commit':
-            dbfilter = install.Install(self, db=self.parallel_db)
+        elif finished_step == 'ubi-timezone':
+            # Flush changes to the database so that when the parallel db
+            # starts, it does so with the most recent changes.
+            self.stop_debconf()
+            self.start_debconf()
+            from ubiquity.debconfcommunicator import DebconfCommunicator
+            if self.parallel_db_install is not None:
+                # we're coming back through again.
+                self.parallel_db_install.shutdown()
+            env = os.environ.copy()
+            # debconf-apt-progress, start_debconf()
+            env['DEBCONF_DB_REPLACE'] = 'configdb'
+            env['DEBCONF_DB_OVERRIDE'] = 'Pipe{infd:none outfd:none}'
+            self.parallel_db_install = DebconfCommunicator('ubiquity',
+                                                           cloexec=True,
+                                                           env=env)
+            # Start the actual install
+            dbfilter = install.Install(self, db=self.parallel_db_install)
             dbfilter.start(auto_process=True)
 
+        # FIXME OH DEAR LORD.  Use isinstance.
         elif finished_step == 'ubiquity.components.install':
             self.finished_installing = True
             if self.finished_pages:
diff --git a/ubiquity/frontend/kde_ui.py b/ubiquity/frontend/kde_ui.py
index 2b2c6fc..ca211b7 100644
--- a/ubiquity/frontend/kde_ui.py
+++ b/ubiquity/frontend/kde_ui.py
@@ -309,6 +309,7 @@ class Wizard(BaseFrontend):
         self.finished_installing = False
         self.finished_pages = False
         self.parallel_db = None
+        self.parallel_db_install = None
 
         self.set_busy_cursor(True)
 
@@ -1316,11 +1317,27 @@ class Wizard(BaseFrontend):
             dbfilter = partman_commit.PartmanCommit(self, db=self.parallel_db)
             dbfilter.start(auto_process=True)
 
-        # FIXME OH DEAR LORD.  Use isinstance.
-        elif finished_step == 'ubiquity.components.partman_commit':
-            dbfilter = install.Install(self, db=self.parallel_db)
+        elif finished_step == 'ubi-timezone':
+            # Flush changes to the database so that when the parallel db
+            # starts, it does so with the most recent changes.
+            self.stop_debconf()
+            self.start_debconf()
+            from ubiquity.debconfcommunicator import DebconfCommunicator
+            if self.parallel_db_install is not None:
+                # we're coming back through again.
+                self.parallel_db_install.shutdown()
+            env = os.environ.copy()
+            # debconf-apt-progress, start_debconf()
+            env['DEBCONF_DB_REPLACE'] = 'configdb'
+            env['DEBCONF_DB_OVERRIDE'] = 'Pipe{infd:none outfd:none}'
+            self.parallel_db_install = DebconfCommunicator('ubiquity',
+                                                           cloexec=True,
+                                                           env=env)
+            # Start the actual install
+            dbfilter = install.Install(self, db=self.parallel_db_install)
             dbfilter.start(auto_process=True)
 
+        # FIXME OH DEAR LORD.  Use isinstance.
         elif finished_step == 'ubiquity.components.install':
             self.finished_installing = True
             if self.finished_pages: