diff options
| -rw-r--r-- | gbp/git/repository.py | 3 | ||||
| -rwxr-xr-x | gbp/scripts/buildpackage.py | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/gbp/git/repository.py b/gbp/git/repository.py index 64792d8..c2d3baa 100644 --- a/gbp/git/repository.py +++ b/gbp/git/repository.py @@ -812,7 +812,8 @@ class GitRepository(object): @return: C{True} if the repository has that tree, C{False} otherwise @rtype: C{bool} """ - out, ret = self._git_getoutput('ls-tree', [ treeish ]) + out, dummy, ret = self._git_inout('ls-tree', [ treeish ], + capture_stderr=True) return [ True, False ][ret != 0] def write_tree(self, index_file=None): diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py index 989801f..d59a76d 100755 --- a/gbp/scripts/buildpackage.py +++ b/gbp/scripts/buildpackage.py @@ -125,7 +125,7 @@ def write_tree(repo, options): else: tree = options.export if not repo.has_treeish(tree): - raise GbpError # git-ls-tree printed an error message already + raise GbpError("%s is not a valid treeish" % tree) else: tree = None return tree @@ -250,7 +250,7 @@ def get_upstream_tree(repo, cp, options): else: upstream_tree = options.upstream_tree if not repo.has_treeish(upstream_tree): - raise GbpError # git-ls-tree printed an error message already + raise GbpError("%s is not a valid treeish" % upstream_tree) return upstream_tree |