Fix wrong method calls and try-except section in 'exit' method
Change-Id: I5704adb6c70c9f40c83eb2c0cb884cb6c4d93e6a
Closes-Bug: #1590071
(cherry picked from commit 3a8b5e8c3a
)
This commit is contained in:
parent
8ffbdd741a
commit
f280de0e35
|
@ -260,10 +260,10 @@ class FuelSetup(object):
|
|||
try:
|
||||
dns_choice_num = int(self.choices.index("DNS & Hostname"))
|
||||
except ValueError:
|
||||
log.info("Something bad happened.")
|
||||
|
||||
obj_dns = self.children[dns_choice_num]
|
||||
obj_dns.fixEtcHosts()
|
||||
log.warning("DNS module wasn't found.")
|
||||
else:
|
||||
obj_dns = self.children[dns_choice_num]
|
||||
obj_dns.fixEtcHosts()
|
||||
|
||||
raise urwid.ExitMainLoop()
|
||||
|
||||
|
|
|
@ -50,7 +50,7 @@ class saveandquit(object):
|
|||
if self.save():
|
||||
self.parent.refreshScreen()
|
||||
time.sleep(1.5)
|
||||
self.parent.exit_program(None)
|
||||
self.parent.exit(None)
|
||||
|
||||
def save(self):
|
||||
results, modulename = self.parent.global_save()
|
||||
|
@ -61,7 +61,7 @@ class saveandquit(object):
|
|||
return False
|
||||
|
||||
def quit_without_saving(self, args):
|
||||
self.parent.exit_program(None)
|
||||
self.parent.exit(None)
|
||||
|
||||
def refresh(self):
|
||||
pass
|
||||
|
|
Loading…
Reference in New Issue