kallithea Changeset - fd5f2b217488

Changeset - fd5f2b217488

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2012-08-30 00:03:48
marcin@python-works.com

get stderr also for git commands, pass in shell = False

2 files changed with 4 insertions and 4 deletions:

rhodecode/lib/subprocessio.py

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

0 comments (0 inline, 0 general)

rhodecode/lib/subprocessio.py

➞

Show inline comments

@@ @@ -338,15 +338,16 @@ class SubprocessIOChunker(object): @@
             input_streamer.start()
             inputstream = input_streamer.output
         if isinstance(cmd, (list, tuple)):
             cmd = ' '.join(cmd)
         _shell = kwargs.get('shell') or True
         kwargs['shell'] = _shell
         _p = subprocess.Popen(cmd,
             bufsize=-1,
             shell=True,
             stdin=inputstream,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
             **kwargs
+            )

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

➞

Show inline comments

@@ @@ -112,24 +112,23 @@ class GitRepository(BaseRepository): @@
         cmd = ['git'] + _copts + cmd
         if _str_cmd:
             cmd = ' '.join(cmd)
         try:
             opts = dict(
                 env=gitenv,
                 shell=False,
+            )
             if os.path.isdir(self.path):
                 opts['cwd'] = self.path
             p = subprocessio.SubprocessIOChunker(cmd, **opts)
         except (EnvironmentError, OSError), err:
             log.error(traceback.format_exc())
             raise RepositoryError("Couldn't run git command (%s).\n"
                                   "Original error was:%s" % (cmd, err))
         so = ''.join(p)
         se = None
         return so, se
         return ''.join(p.output), ''.join(p.error)
     @classmethod
     def _check_url(cls, url):
         """
         Functon will check given url and try to verify if it's a valid
         link. Sometimes it may happened that mercurial will issue basic

0 comments (0 inline, 0 general)