Correct exit when no disk is selected and we don't wish to continue (#1049)
This commit is contained in:
parent
02c715e224
commit
e0d723f9a0
|
|
@ -99,6 +99,7 @@ class GlobalMenu(GeneralMenu):
|
||||||
Selector(
|
Selector(
|
||||||
_('Specify superuser account'),
|
_('Specify superuser account'),
|
||||||
lambda preset: self._create_superuser_account(),
|
lambda preset: self._create_superuser_account(),
|
||||||
|
default={},
|
||||||
exec_func=lambda n,v:self._users_resynch(),
|
exec_func=lambda n,v:self._users_resynch(),
|
||||||
dependencies_not=['!root-password'],
|
dependencies_not=['!root-password'],
|
||||||
display_func=lambda x: self._display_superusers())
|
display_func=lambda x: self._display_superusers())
|
||||||
|
|
@ -254,7 +255,8 @@ class GlobalMenu(GeneralMenu):
|
||||||
choice = Menu(prompt, ['yes', 'no'], default_option='yes').run()
|
choice = Menu(prompt, ['yes', 'no'], default_option='yes').run()
|
||||||
|
|
||||||
if choice == 'no':
|
if choice == 'no':
|
||||||
return self._select_harddrives(old_harddrives)
|
exit(1)
|
||||||
|
|
||||||
|
|
||||||
return harddrives
|
return harddrives
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue