summaryrefslogtreecommitdiff
path: root/gbp/scripts/pull.py
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2012-07-03 11:48:21 +0300
committerGuido Günther <agx@sigxcpu.org>2012-07-28 16:27:40 +0200
commitcd829c9437d42f3223fbf51e22b795d2fcc33d00 (patch)
tree34c6deac49a9c06b8c01fb10c5fbcc21ce31c7e2 /gbp/scripts/pull.py
parent6e4138faae673bd3398b1c85829a41e348e40caf (diff)
GitRepository: raise GitRepositoryError on git errors
Raise GitRepositoryError in cases where CommandExecFailed (from GitCommand) was previously silently passed forward. Heavily based on a patch by Markus Lehtonen <markus.lehtonen@linux.intel.com>
Diffstat (limited to 'gbp/scripts/pull.py')
-rwxr-xr-xgbp/scripts/pull.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/gbp/scripts/pull.py b/gbp/scripts/pull.py
index adfe2bc..3f51749 100755
--- a/gbp/scripts/pull.py
+++ b/gbp/scripts/pull.py
@@ -127,7 +127,7 @@ def main(argv):
repo.set_branch(current)
except CommandExecFailed:
retval = 1
- except GbpError as err:
+ except (GbpError, GitRepositoryError) as err:
if len(err.__str__()):
gbp.log.err(err)
retval = 1