##// END OF EJS Templates
fixed handling shell argument in subprocess calls, it always was hardcoded even when passed properly in arguments
marcink -
r3830:08d439bf beta
parent child Browse files
Show More
@@ -125,10 +125,11 b' class GitRepository(BaseRepository):'
125 cmd = [_git_path] + _copts + cmd
125 cmd = [_git_path] + _copts + cmd
126 if _str_cmd:
126 if _str_cmd:
127 cmd = ' '.join(cmd)
127 cmd = ' '.join(cmd)
128
128 try:
129 try:
129 _opts = dict(
130 _opts = dict(
130 env=gitenv,
131 env=gitenv,
131 shell=False,
132 shell=True,
132 )
133 )
133 _opts.update(opts)
134 _opts.update(opts)
134 p = subprocessio.SubprocessIOChunker(cmd, **_opts)
135 p = subprocessio.SubprocessIOChunker(cmd, **_opts)
@@ -342,10 +342,10 b' class SubprocessIOChunker(object):'
342 input_streamer.start()
342 input_streamer.start()
343 inputstream = input_streamer.output
343 inputstream = input_streamer.output
344
344
345 _shell = kwargs.get('shell', True)
345 if isinstance(cmd, (list, tuple)):
346 if isinstance(cmd, (list, tuple)):
346 cmd = ' '.join(cmd)
347 cmd = ' '.join(cmd)
347
348
348 _shell = kwargs.get('shell') or True
349 kwargs['shell'] = _shell
349 kwargs['shell'] = _shell
350 _p = subprocess.Popen(cmd,
350 _p = subprocess.Popen(cmd,
351 bufsize=-1,
351 bufsize=-1,
General Comments 0
You need to be logged in to leave comments. Login now