From 71e9e244caabfca463e7898ff684a9861bb5a582 Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Sat, 27 Apr 2013 22:20:04 +0200 Subject: GitRepository.commit_dir: raise GitRepositoryError instead of GbpError and make sure the callers forward the error properly --- gbp/git/repository.py | 2 +- gbp/scripts/import_dsc.py | 5 +++-- gbp/scripts/import_orig.py | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/gbp/git/repository.py b/gbp/git/repository.py index 2983228..78d8701 100644 --- a/gbp/git/repository.py +++ b/gbp/git/repository.py @@ -1250,7 +1250,7 @@ class GitRepository(object): commit = self.commit_tree(tree=tree, msg=msg, parents=parents, author=author, committer=committer) if not commit: - raise GbpError("Failed to commit tree") + raise GitRepositoryError("Failed to commit tree") self.update_ref("refs/heads/%s" % branch, commit, cur) return commit diff --git a/gbp/scripts/import_dsc.py b/gbp/scripts/import_dsc.py index 98b2d42..7ed0e36 100644 --- a/gbp/scripts/import_dsc.py +++ b/gbp/scripts/import_dsc.py @@ -139,8 +139,9 @@ def apply_debian_patch(repo, unpack_dir, src, options, parents): commit=commit, sign=options.sign_tags, keyid=options.keyid) - except (gbpc.CommandExecFailed, GitRepositoryError): - gbp.log.err("Failed to import Debian package") + except (gbpc.CommandExecFailed, GitRepositoryError) as err: + msg = err.__str__() if len(err.__str__()) else '' + gbp.log.err("Failed to import Debian package: %s" % msg) raise GbpError finally: os.chdir(repo.path) diff --git a/gbp/scripts/import_orig.py b/gbp/scripts/import_orig.py index d230a96..d082496 100644 --- a/gbp/scripts/import_orig.py +++ b/gbp/scripts/import_orig.py @@ -357,8 +357,9 @@ def main(argv): info = { 'version': "%s%s-1" % (epoch, version) } env = { 'GBP_BRANCH': options.debian_branch } gbpc.Command(options.postimport % info, extra_env=env, shell=True)() - except (gbpc.CommandExecFailed, GitRepositoryError): - raise GbpError("Import of %s failed" % source.path) + except (gbpc.CommandExecFailed, GitRepositoryError) as err: + msg = err.__str__() if len(err.__str__()) else '' + raise GbpError("Import of %s failed: %s" % (source.path, msg)) except GbpError as err: if len(err.__str__()): gbp.log.err(err) -- cgit v1.2.3