git pull won't work in case of conflicts etc. Cheap way to solve it
This commit is contained in:
parent
332bb97a78
commit
e48b84b4fb
|
|
@ -52,6 +52,9 @@ def run(cmd):
|
|||
def update_git():
|
||||
default_gw = get_default_gateway_linux()
|
||||
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')
|
||||
|
||||
if b'error:' in output:
|
||||
|
|
|
|||
Loading…
Reference in New Issue