QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qubes-anaconda-addon: Let run_command optionally ignore failures

Browse Source
This commit is contained in:
M. Vefa Bicakci 2016-04-10 00:00:00 -04:00
parent de501a473e
commit 9fdff6c906
No known key found for this signature in database
GPG Key ID: 1DF87CE3B3A5DFAF
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
qubes-anaconda-addon/org_qubes_os_initial_setup/gui/spokes/qubes_os.py
View File

@ -225,7 +225,6 @@ class QubesOsSpoke(FirstbootOnlySpokeMixIn, NormalSpoke):
self.main_box = self.builder.get_object("mainBox") self.main_box = self.builder.get_object("mainBox")
self.thread_dialog = None self.thread_dialog = None
self.process_error = None
self.qubes_user = None self.qubes_user = None
self.qubes_gid = None self.qubes_gid = None
self.default_template = 'fedora-23' self.default_template = 'fedora-23'
@ -456,7 +455,9 @@ class QubesOsSpoke(FirstbootOnlySpokeMixIn, NormalSpoke):
if self.thread_dialog != None: if self.thread_dialog != None:
self.thread_dialog.set_text(stage) self.thread_dialog.set_text(stage)
def run_command(self, command, stdin=None): def run_command(self, command, stdin=None, ignore_failure=False):
process_error = None
try: try:
sys_root = iutil.getSysroot() sys_root = iutil.getSysroot()
@ -467,17 +468,15 @@ class QubesOsSpoke(FirstbootOnlySpokeMixIn, NormalSpoke):
stdout = stdout.decode("utf-8") stdout = stdout.decode("utf-8")
stderr = stderr.decode("utf-8") stderr = stderr.decode("utf-8")
if cmd.returncode == 0: if not ignore_failure and cmd.returncode != 0:
self.process_error = None process_error = "{} failed:\nstdout: \"{}\"\nstderr: \"{}\"".format(command, stdout, stderr)
else:
self.process_error = "{} failed:\nstdout: \"{}\"\nstderr: \"{}\"".format(command, stdout, stderr)
except Exception as e: except Exception as e:
self.process_error = str(e) process_error = str(e)
if self.process_error: if process_error:
self.logger.error(self.process_error) self.logger.error(process_error)
raise Exception(self.process_error) raise Exception(process_error)
return (stdout, stderr) return (stdout, stderr)