diff options
author | Guido Günther <agx@sigxcpu.org> | 2013-04-27 22:20:04 +0200 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2013-04-27 22:22:28 +0200 |
commit | 71e9e244caabfca463e7898ff684a9861bb5a582 (patch) | |
tree | 69b01f123e919f9af063dced2c2e56c73a9bd64d /gbp/scripts | |
parent | 59ecaafcfe03bfcda37b1cecfcc98d98383e541c (diff) |
GitRepository.commit_dir: raise GitRepositoryError instead of GbpError
and make sure the callers forward the error properly
Diffstat (limited to 'gbp/scripts')
-rw-r--r-- | gbp/scripts/import_dsc.py | 5 | ||||
-rw-r--r-- | gbp/scripts/import_orig.py | 5 |
2 files changed, 6 insertions, 4 deletions
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) |