From 7ad7f45abcfaf5e5a4b009c4ddcf76fb16bff994 Mon Sep 17 00:00:00 2001
From: Daniel Brown <ddb@star.sr.bham.ac.uk>
Date: Thu, 1 Aug 2013 11:14:28 +0100
Subject: [PATCH] fixing git calls so that it passes list to popen rather than
string
---
pykat/testing/utils.py | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/pykat/testing/utils.py b/pykat/testing/utils.py
index a35b6cf..cf48ad8 100644
--- a/pykat/testing/utils.py
+++ b/pykat/testing/utils.py
@@ -29,17 +29,16 @@ def runcmd(args):
def git(args, git_bin=GIT_BIN):
cmd = ""
- if type(args) is list:
- args.insert(0,git_bin)
- cmd = " ".join(args)
- else:
- cmd = git_bin + " " + args
-
- print cmd
-
- print os.getcwd()
+ if type(args) is str:
+ args = args.split(" ")
+ elif type(args) is not list:
+ raise Exception("arg for utils.git must be a list or string")
+
+ args.insert(0, git_bin)
+
+ print "GIT CMD: " + " ".join(args), os.getcwd()
- p = sub.Popen(cmd, stdout=sub.PIPE, stderr=sub.PIPE)
+ p = sub.Popen(args, stdout=sub.PIPE, stderr=sub.PIPE)
out, err = p.communicate()
if p.returncode != 0:
--
GitLab