Skip to content
Snippets Groups Projects
Commit adcac997 authored by Andreas Klöckner's avatar Andreas Klöckner
Browse files

Update aksetup

parent 4bc203f6
No related branches found
No related tags found
No related merge requests found
...@@ -703,6 +703,7 @@ def substitute(substitutions, fname): ...@@ -703,6 +703,7 @@ def substitute(substitutions, fname):
def _run_git_command(cmd): def _run_git_command(cmd):
git_error = None git_error = None
from subprocess import Popen, PIPE from subprocess import Popen, PIPE
stdout = None
try: try:
popen = Popen(["git"] + cmd, stdout=PIPE) popen = Popen(["git"] + cmd, stdout=PIPE)
stdout, stderr = popen.communicate() stdout, stderr = popen.communicate()
...@@ -722,8 +723,11 @@ def _run_git_command(cmd): ...@@ -722,8 +723,11 @@ def _run_git_command(cmd):
print(git_error) print(git_error)
print("Hit Ctrl-C now if you'd like to think about the situation.") print("Hit Ctrl-C now if you'd like to think about the situation.")
print(DASH_SEPARATOR) print(DASH_SEPARATOR)
count_down_delay(delay=5) count_down_delay(delay=0)
return stdout.decode("utf-8"), git_error if stdout:
return stdout.decode("utf-8"), git_error
else:
return '', "(subprocess call to git did not succeed)"
def check_git_submodules(): def check_git_submodules():
......
#! /usr/bin/env python #! /usr/bin/env python
from __future__ import absolute_import
from aksetup_helper import configure_frontend from aksetup_helper import configure_frontend
configure_frontend() configure_frontend()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment