Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall.py
diff options
context:
space:
mode:
authorLord Anton Hvornum <anton.feeds@gmail.com>2018-04-07 17:41:47 +0200
committerLord Anton Hvornum <anton.feeds@gmail.com>2018-04-07 17:41:47 +0200
commit88f1f85bf4b50897a080780f5403f7453350672b (patch)
tree4775967b7278d697744d98fd3fdfc970dd10bef1 /archinstall.py
parent8dedabbf76b5a134f78dd1dfc72458e496d558ec (diff)
Problem with the optional parameters in the post install script
Diffstat (limited to 'archinstall.py')
-rw-r--r--archinstall.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/archinstall.py b/archinstall.py
index 91fb9da1..d471f161 100644
--- a/archinstall.py
+++ b/archinstall.py
@@ -263,10 +263,11 @@ if __name__ == '__main__':
for title in instructions:
print('[N] {}'.format(title))
for command in instructions[title]:
- opts = instructions[title][command] if instructions[title][command] else {}
+ opts = instructions[title][command] if type(instructions[title][command]) in (dict, oDict) else {}
+
print('[N] Command: {} ({})'.format(command, opts))
o = run('arch-chroot /mnt {c}'.format(c=command), echo=True, **opts)
- if instructions[title][command] and not instructions[title][command] in o:
+ if len(instructions[title][command]) and type(instructions[title][command]) == bytes and not instructions[title][command] in o:
print('[W] Post install command failed: {}'.format(o.decode('UTF-8')))
#print(o)