_dovccmd => encode all its arguments (ascii)

buildbot · Dec 11, 2014 · fc0808d · fc0808d
1 parent 6d084c7
commit fc0808d
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/master/buildbot/changes/gitpoller.py b/master/buildbot/changes/gitpoller.py
@@ -298,8 +298,15 @@ def _process_changes(self, newRev, branch):
                 src=u'git')
 
     def _dovccmd(self, command, args, path=None):
-        d = utils.getProcessOutputAndValue(self.gitbin,
-                                           [command] + args, path=path, env=os.environ)
+        def encodeArg(arg):
+            if isinstance(arg, list):
+                return [encodeArg(a) for a in arg]
+            elif isinstance(arg, unicode):
+                return arg.encode("ascii")
+            return arg
+        d = utils.getProcessOutputAndValue(encodeArg(self.gitbin),
+                                           encodeArg([command] + args),
+                                           path=encodeArg(path), env=os.environ)
 
         def _convert_nonzero_to_failure(res,
                                         command,