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

Doing live tests

This commit is contained in:
Anton Hvornum 2019-04-11 20:40:26 +02:00
parent e932d6fe88
commit 416971160e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archinstall.py
View File

@ -165,7 +165,8 @@ class sys_command():
yield output 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): # def sys_command(cmd, echo=False, opts=None, *args, **kwargs):
# if not opts: opts = {} # if not opts: opts = {}
@ -198,7 +199,7 @@ def update_git():
os.remove('/root/archinstall/archinstall.py') os.remove('/root/archinstall/archinstall.py')
os.remove('/root/archinstall/README.md') 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: 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.')
@ -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' # 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) tmp = re.findall(b'[0-9]+ file changed', output)
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):