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-06-20 18:15:40 +0000
committerAnton Hvornum <anton.feeds@gmail.com>2019-06-20 18:15:40 +0000
commitabaf778241acaebd645fef100bde4c0c0519c52e (patch)
tree2775223dffde3bc52cbbf5e955d22c40f668c8a4 /archinstall.py
parent9e9c8e0051b7658a181e849a27904a2e8feb01a2 (diff)
Faulty git update/pull logic. a reset and pull at the same time will make it contain a lot more information
Diffstat (limited to 'archinstall.py')
-rw-r--r--archinstall.py21
1 files changed, 11 insertions, 10 deletions
diff --git a/archinstall.py b/archinstall.py
index c79a5d4d..2e51bc6b 100644
--- a/archinstall.py
+++ b/archinstall.py
@@ -269,16 +269,17 @@ def update_git():
return
# b'From github.com:Torxed/archinstall\n 339d687..80b97f3 master -> origin/master\nUpdating 339d687..80b97f3\nFast-forward\n README.md | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n'
- if not b'Already up to date' in output:
- tmp = re.findall(b'[0-9]+ file changed', output)
- print(tmp)
- if len(tmp):
- num_changes = int(tmp[0].split(b' ',1)[0])
- if(num_changes):
- ## Reboot the script (in same context)
- print('[N] Rebooting the script')
- os.execv('/usr/bin/python3', ['archinstall.py'] + sys.argv)
- extit(1)
+ if output != b'Already up to date':
+ #tmp = re.findall(b'[0-9]+ file changed', output)
+ #print(tmp)
+ #if len(tmp):
+ # num_changes = int(tmp[0].split(b' ',1)[0])
+ # if(num_changes):
+
+ ## Reboot the script (in same context)
+ print('[N] Rebooting the script')
+ os.execv('/usr/bin/python3', ['archinstall.py'] + sys.argv)
+ extit(1)
def device_state(name):
# Based out of: https://askubuntu.com/questions/528690/how-to-get-list-of-all-non-removable-disk-device-names-ssd-hdd-and-sata-ide-onl/528709#528709