kallithea Changeset - 08d439bfbd8c

Changeset - 08d439bfbd8c

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2013-05-09 13:29:03
marcin@python-works.com

fixed handling shell argument in subprocess calls, it always was hardcoded even when passed properly in arguments

2 files changed with 4 insertions and 3 deletions:

rhodecode/lib/vcs/backends/git/repository.py

rhodecode/lib/vcs/subprocessio.py

0 comments (0 inline, 0 general)

rhodecode/lib/vcs/backends/git/repository.py

➞

Show inline comments

@@ @@ -122,16 +122,17 @@ class GitRepository(BaseRepository): @@
         gitenv['GIT_CONFIG_NOGLOBAL'] = '1'
         _git_path = settings.GIT_EXECUTABLE_PATH
         cmd = [_git_path] + _copts + cmd
         if _str_cmd:
             cmd = ' '.join(cmd)
         try:
             _opts = dict(
                 env=gitenv,
-                shell=False,
+                shell=True,
+            )
             _opts.update(opts)
             p = subprocessio.SubprocessIOChunker(cmd, **_opts)
         except (EnvironmentError, OSError), err:
             tb_err = ("Couldn't run git command (%s).\n"
                       "Original error was:%s\n" % (cmd, err))

rhodecode/lib/vcs/subprocessio.py

➞

Show inline comments

@@ @@ -339,24 +339,24 @@ class SubprocessIOChunker(object): @@
         if inputstream:
             input_streamer = StreamFeeder(inputstream)
             input_streamer.start()
             inputstream = input_streamer.output
         _shell = kwargs.get('shell', True)
         if isinstance(cmd, (list, tuple)):
             cmd = ' '.join(cmd)
         _shell = kwargs.get('shell') or True
         kwargs['shell'] = _shell
         _p = subprocess.Popen(cmd,
             bufsize=-1,
             stdin=inputstream,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
             **kwargs
+            )
+        )
         bg_out = BufferedGenerator(_p.stdout, buffer_size, chunk_size, starting_values)
         bg_err = BufferedGenerator(_p.stderr, 16000, 1, bottomless=True)
         while not bg_out.done_reading and not bg_out.reading_paused and not bg_err.length:
             # doing this until we reach either end of file, or end of buffer.

0 comments (0 inline, 0 general)