summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2013-04-27 22:15:43 +0200
committerGuido Günther <agx@sigxcpu.org>2013-04-27 22:15:43 +0200
commit59ecaafcfe03bfcda37b1cecfcc98d98383e541c (patch)
treefa456748a2ea1802f2be9a2f566b561cbc870ec8
parenta949f93396a01ede202f5c5629e53ae8c8d4877f (diff)
Silence GitRepository.write_tree
but add any error output to the exception instead. All callers have been audited to properly output the message if needed.
-rw-r--r--gbp/git/repository.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/gbp/git/repository.py b/gbp/git/repository.py
index b1e7795f..29832286 100644
--- a/gbp/git/repository.py
+++ b/gbp/git/repository.py
@@ -830,10 +830,12 @@ class GitRepository(object):
else:
extra_env = None
- tree, ret = self._git_getoutput('write-tree', extra_env=extra_env)
+ tree, stderr, ret = self._git_inout('write-tree', [],
+ extra_env=extra_env,
+ capture_stderr=True)
if ret:
- raise GitRepositoryError("Can't write out current index")
- return tree[0].strip()
+ raise GitRepositoryError("Can't write out current index: %s" % stderr[:-1])
+ return tree.strip()
def make_tree(self, contents):
"""