Merge pull request #539 from mwhudson/dont-call-default

update a few leftover calls to controller.default()
canonical · Sep 25, 2019 · cff9b05 · cff9b05
2 parents 8e29d93 + 130c95f
commit cff9b05
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/subiquity/controllers/filesystem.py b/subiquity/controllers/filesystem.py
@@ -103,12 +103,12 @@ def _probed(self, fut, restricted=False):
             else:
                 self._probe_state = ProbeState.FAILED
                 if self.showing:
-                    self.default()
+                    self.start_ui()
         else:
             self._probe_state = ProbeState.DONE
             # Should do something here if probing found no devices.
             if self.showing:
-                self.default()
+                self.start_ui()
 
     def _check_probe_timeout(self):
         log.debug("_check_probe_timeout")

diff --git a/subiquity/controllers/installprogress.py b/subiquity/controllers/installprogress.py
@@ -254,7 +254,7 @@ def curtin_error(self, log_text=None):
         self.progress_view.set_status(('info_error',
                                        _("An error has occurred")))
         self.progress_view.show_complete(True)
-        self.default()
+        self.start_ui()
 
     def _bg_run_command_logged(self, cmd, **kwargs):
         cmd = ['systemd-cat', '--level-prefix=false',

diff --git a/subiquity/ui/views/filesystem/filesystem.py b/subiquity/ui/views/filesystem/filesystem.py
@@ -533,7 +533,7 @@ def create_vg(self, button=None):
         self.show_stretchy_overlay(VolGroupStretchy(self))
 
     def cancel(self, button=None):
-        self.controller.default()
+        self.controller.start_ui()
 
     def reset(self, button):
         self.controller.reset()

diff --git a/subiquity/ui/views/filesystem/guided.py b/subiquity/ui/views/filesystem/guided.py
@@ -150,7 +150,7 @@ def __init__(self, model, controller, method):
                 + _("Choose the disk to install to:"))))
 
     def cancel(self, btn=None):
-        self.controller.default()
+        self.controller.start_ui()
 
     def choose_disk(self, btn, disk):
         self.controller.reformat(disk)