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-04-11 20:40:26 +0200
committerAnton Hvornum <anton.feeds@gmail.com>2019-04-11 20:40:26 +0200
commit416971160ec60750304a3a11c7e3de1cf5503bfd (patch)
treeb587ec761ad229f656576fac9caea9396a7d0a6d /archinstall.py
parente932d6fe886709312eea732d3fa3de3cb93786ba (diff)
Doing live tests
Diffstat (limited to 'archinstall.py')
-rw-r--r--archinstall.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/archinstall.py b/archinstall.py
index 23d39d02..a4d36a5a 100644
--- a/archinstall.py
+++ b/archinstall.py
@@ -165,7 +165,8 @@ class sys_command():
yield output
- os.waitpid(self.pid, 0)
+ x = os.waitpid(self.pid, 0)
+ print('Exited with:', x)
# def sys_command(cmd, echo=False, opts=None, *args, **kwargs):
# if not opts: opts = {}
@@ -198,7 +199,7 @@ def update_git():
os.remove('/root/archinstall/archinstall.py')
os.remove('/root/archinstall/README.md')
- output = b''.join(sys_command('(cd /root/archinstall; git update)').exec()) # git reset --hard origin/<branch_name>
+ output = b''.join(sys_command('(cd /root/archinstall; git update)').exec()) # git reset --hard origin/<branch_name> / git fetch --all
if b'error:' in output:
print('[N] Could not update git source for some reason.')
@@ -206,6 +207,7 @@ 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'
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):