RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

probihiting recursion bombs regarding git pull

This commit is contained in:
Anton Hvornum 2019-06-20 18:25:43 +00:00
parent eb3a846be8
commit f928a4b72c
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
archinstall.py
View File

@ -262,8 +262,7 @@ def update_git():
if os.path.isfile('/root/archinstall/README.md'): if os.path.isfile('/root/archinstall/README.md'):
os.remove('/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 pull)') output = simple_command('(cd /root/archinstall; git reset --hard origin/$(git branch | grep "*" | cut -d\' \' -f 2); git pull)')
output = simple_command('(cd /root/archinstall; git pull)')
if b'error:' in output: if b'error:' in output:
print('[N] Could not update git source for some reason.') print('[N] Could not update git source for some reason.')
@ -271,17 +270,17 @@ def update_git():
# 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' # 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 output != b'Already up to date': if output != b'Already up to date':
print(output)
#tmp = re.findall(b'[0-9]+ file changed', output) #tmp = re.findall(b'[0-9]+ file changed', output)
#print(tmp) #print(tmp)
#if len(tmp): #if len(tmp):
# num_changes = int(tmp[0].split(b' ',1)[0]) # num_changes = int(tmp[0].split(b' ',1)[0])
# if(num_changes): # if(num_changes):
## Reboot the script (in same context) if not 'rebooted' in args:
print('[N] Rebooting the script') ## Reboot the script (in same context)
os.execv('/usr/bin/python3', ['archinstall.py'] + sys.argv) print('[N] Rebooting the script')
extit(1) os.execv('/usr/bin/python3', ['archinstall.py', '--rebooted'] + sys.argv)
extit(1)
def device_state(name): 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 # 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