Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hvornum <anton.feeds+github@gmail.com>2019-11-13 22:51:16 +0000
committerAnton Hvornum <anton.feeds+github@gmail.com>2019-11-13 22:51:16 +0000
commit211fdee511b0defabee12439344dfcade18863b9 (patch)
tree5e16b612c7a25f5436b88c9f1c5c40f782799596
parent010e931aeb5ca40577e9e7db933c31b8fa594eb3 (diff)
Fixed branch checking
-rw-r--r--archinstall.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/archinstall.py b/archinstall.py
index 35938763..2222a511 100644
--- a/archinstall.py
+++ b/archinstall.py
@@ -336,8 +336,8 @@ def update_git(branch='master'):
# if(num_changes):
if branch != 'master':
- on_branch = simple_command('(cd /root/archinstall; git branch | grep "*" | cut -d\' \' -f 2)')
- if on_branch.strip().lower() != branch.strip().lower():
+ on_branch = simple_command('(cd /root/archinstall; git branch | grep "*" | cut -d\' \' -f 2)').decode('UTF-8').strip()
+ if on_branch.lower() != branch.lower():
print(f'[N] Changing branch from {on_branch} to {branch}')
output = simple_command(f'(cd /root/archinstall; git checkout {branch}; git pull)')
print('[N] Rebooting the new branch')