Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hvornum <anton.feeds@gmail.com>2019-06-14 23:00:19 +0200
committerAnton Hvornum <anton.feeds@gmail.com>2019-06-14 23:00:19 +0200
commitd984f728ccd6cc23c6445f5eeb0ffde03cb98d17 (patch)
tree824a4931116050259d3703090815b4ef18a203bc
parent6333260f9ac403a6c5c2712af1c54b61638eacb7 (diff)
More debug output
-rw-r--r--archinstall.py12
1 files changed, 11 insertions, 1 deletions
diff --git a/archinstall.py b/archinstall.py
index de546c3f..8e5ffca6 100644
--- a/archinstall.py
+++ b/archinstall.py
@@ -132,7 +132,11 @@ class sys_command():
return self.exec()
def __leave__(self, *args, **kwargs):
+ if 'debug' in self.opts and self.opts['debug']:
+ print('[N] Leaving subsystem routine.')
os.waitpid(self.pid, 0)
+ if 'debug' in self.opts and self.opts['debug']:
+ print('[N] (Bye bye!)')
def exec(self):
if not self.cmd[0][0] == '/':
@@ -183,13 +187,16 @@ class sys_command():
print('[N] Last command finished, exiting subsystem.')
alive = False
break
-
yield output
+ if 'debug' in self.opts and self.opts['debug']:
+ print('[N] Exited subsystem, instructing it to shutdown.')
# Since we're in a subsystem, we gotta bail out!
# Bail bail bail!
os.write(child_fd, b'shutdown now\n')
+ if 'debug' in self.opts and self.opts['debug']:
+ print('[N] Waiting for exit code.')
exit_code = os.waitpid(self.pid, 0)[1]
if exit_code != 0:
@@ -198,6 +205,9 @@ class sys_command():
print('[?] Command executed: {}'.format(self.cmd))
exit(1)
+ if 'debug' in self.opts and self.opts['debug']:
+ print('[N] Subsystem routine complete.')
+
def simple_command(cmd, opts=None, *args, **kwargs):
if not opts: opts = {}
if 'debug' in opts: