Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall.py
diff options
context:
space:
mode:
authorAnton Hvornum <anton.feeds@gmail.com>2019-04-11 21:15:17 +0200
committerAnton Hvornum <anton.feeds@gmail.com>2019-04-11 21:15:17 +0200
commit80d7fca43d73bde4576f239c95e94388cc2b1a23 (patch)
treea24194298ed583b5103cbc7377746b30fb920bcd /archinstall.py
parent3fb42df1626b6328864620c577b1e2b7e1b0c278 (diff)
Fixed a output message
Diffstat (limited to 'archinstall.py')
-rw-r--r--archinstall.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/archinstall.py b/archinstall.py
index 7bfac35d..f76911a8 100644
--- a/archinstall.py
+++ b/archinstall.py
@@ -205,7 +205,7 @@ def update_git():
if os.path.isfile('/root/archinstall/README.md'):
os.remove('/root/archinstall/README.md')
- output = simple_command('(cd /root/archinstall; git reset --hard origin/$(git branch | grep "*" | cut -d\' \' -f 2))') # git reset --hard origin/<branch_name> / git fetch --all
+ output = simple_command('(cd /root/archinstall; git reset --hard origin/$(git branch | grep "*" | cut -d\' \' -f 2); git pull)')
print(output)
if b'error:' in output:
@@ -466,8 +466,8 @@ if __name__ == '__main__':
exit(1)
o = sys_command('/usr/bin/cryptsetup open {drive}{partition_2} luksdev --key-file {pwfile} --type luks2'.format(**args)).exec()
- o = sys_command('/usr/bin/file /dev/mapper/luksdev').exec() # /dev/dm-0
- if b'cannot open' in b''.join(o):
+ o = b''.join(sys_command('/usr/bin/file /dev/mapper/luksdev').exec()) # /dev/dm-0
+ if b'cannot open' in o:
print('[E] Could not mount encrypted device.', o)
exit(1)