diff options
author | Guido Günther <agx@sigxcpu.org> | 2013-04-24 07:10:56 +0200 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2013-04-24 07:12:35 +0200 |
commit | 361aba533cc1f3f59c0a4a0436fae49536df452d (patch) | |
tree | cf9365ace8798899346ec844dc97518c6112d041 /gbp/git | |
parent | a460d3a759c2a115fb7b6217097f3e5f071abc33 (diff) |
Silence _git_command
by using _git_inout instead of GitCommand
Diffstat (limited to 'gbp/git')
-rw-r--r-- | gbp/git/repository.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/gbp/git/repository.py b/gbp/git/repository.py index 5610668..5306e9e 100644 --- a/gbp/git/repository.py +++ b/gbp/git/repository.py @@ -22,7 +22,6 @@ import re from collections import defaultdict import gbp.log as log -from gbp.command_wrappers import (GitCommand, CommandExecFailed) from gbp.errors import GbpError from gbp.git.modifier import GitModifier from gbp.git.commit import GitCommit @@ -166,10 +165,16 @@ class GitRepository(object): @type extra_env: C{dict} """ try: - GitCommand(command, args, extra_env=extra_env, cwd=self.path)() - except CommandExecFailed as excobj: - raise GitRepositoryError("Error running git %s: %s" % - (command, excobj)) + stdout, stderr, ret = self._git_inout(command=command, + args=args, + input=None, + extra_env=extra_env, + capture_stderr=True) + except Exception as excobj: + raise GitRepositoryError("Error running git %s: %s" % (command, excobj)) + if ret: + raise GitRepositoryError("Error running git %s: %s" % (command, stderr)) + def _cmd_has_feature(self, command, feature): """ |