Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLord Anton Hvornum <anton.feeds@gmail.com>2018-04-07 00:29:40 +0200
committerLord Anton Hvornum <anton.feeds@gmail.com>2018-04-07 00:29:40 +0200
commite48b84b4fbd6998a53caa6d2f8dc00fb70b85f55 (patch)
treed88e1dd9adf2e5815ee26fc4e27a32910347a7a1
parent332bb97a782a4f467b24fa6b9320f9d1de597110 (diff)
git pull won't work in case of conflicts etc. Cheap way to solve it
-rw-r--r--archinstall.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/archinstall.py b/archinstall.py
index a5e88700..29e32f73 100644
--- a/archinstall.py
+++ b/archinstall.py
@@ -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: