X-Git-Url: https://git.ralfj.de/mass-build.git/blobdiff_plain/c976b3f574ab95deeab7fcd666d90e72443c39ff..8305e00803ac24b824091d634418a69294f0407a:/vcs.py?ds=inline

diff --git a/vcs.py b/vcs.py
index 7e6c1a3..5e481de 100644
--- a/vcs.py
+++ b/vcs.py
@@ -32,14 +32,10 @@ def get_non_digit_prefix(val):
 
 class GitCommand:
 	def __getattr__(self, name):
-		def call(*args, suppress_stderr = False):
+		def call(*args, get_stderr = False):
 			cmd = ["git", name.replace('_', '-')] + list(args)
-			with subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE if suppress_stderr else None) as p:
-				(stdout, stderr) = p.communicate()
-				if p.returncode != 0:
-					raise Exception("Running %s returned non-zero exit code %d" % (str(cmd), p.returncode))
-			stdout = stdout.decode('utf-8').strip('\n')
-			return stdout
+			output = subprocess.check_output(cmd, stderr=subprocess.STDOUT if get_stderr else None)
+			return output.decode('utf-8').strip('\n')
 		return call
 git = GitCommand()
 
@@ -76,7 +72,7 @@ class Git:
 			if isBranch: # make sure we track the correct remote branch
 				git.branch("-u", self.commit, branchname)
 		# update it to the latest remote commit
-		git.checkout(branchname, suppress_stderr=True)
+		git.checkout(branchname, get_stderr=True)
 		if mode == MODE_RESET:
 			git.reset("--hard", self.commit)
 		else: