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

git pull won't work in case of conflicts etc. Cheap way to solve it

This commit is contained in:
Lord Anton Hvornum 2018-04-07 00:29:40 +02:00
parent 332bb97a78
commit e48b84b4fb
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
archinstall.py
View File

@ -52,6 +52,9 @@ def run(cmd):
def update_git(): def update_git():
default_gw = get_default_gateway_linux() default_gw = get_default_gateway_linux()
if(default_gw): if(default_gw):
## Not the most elegant way to make sure git conflicts doesn't occur (yea fml)
os.remove('/root/archinstall/archinstall.py')
os.remove('/root/archinstall/README.md')
output = run('git pull') output = run('git pull')
if b'error:' in output: if b'error:' in output: