From e6ee3cabbaa5b12d63a9caf863566f62b74deaf9 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Tue, 8 Dec 2015 18:12:11 -0600
Subject: [PATCH] Incorporate Christoph Gohlke's git submodule workaround
---
aksetup_helper.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/aksetup_helper.py b/aksetup_helper.py
index b7378b55..a3e3afc5 100644
--- a/aksetup_helper.py
+++ b/aksetup_helper.py
@@ -703,6 +703,7 @@ def substitute(substitutions, fname):
def _run_git_command(cmd):
git_error = None
from subprocess import Popen, PIPE
+ stdout = None
try:
popen = Popen(["git"] + cmd, stdout=PIPE)
stdout, stderr = popen.communicate()
@@ -722,8 +723,11 @@ def _run_git_command(cmd):
print(git_error)
print("Hit Ctrl-C now if you'd like to think about the situation.")
print(DASH_SEPARATOR)
- count_down_delay(delay=5)
- return stdout.decode("utf-8"), git_error
+ count_down_delay(delay=0)
+ if stdout:
+ return stdout.decode("utf-8"), git_error
+ else:
+ return '', "(subprocess call to git did not succeed)"
def check_git_submodules():
--
GitLab