aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2011-11-06 16:11:25 +0100
committerGuido Günther <agx@sigxcpu.org>2011-11-06 17:30:43 +0100
commitbc82714695ab625e83086fed74d9efae5a3873f1 (patch)
treee253947a2509854be5a33ce09ddb29dd3f69b192
parent052706115d25b6f05b03ad2ed8d2a75f5abcb704 (diff)
FastImport: robustify exception handling
-rw-r--r--gbp/git.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/gbp/git.py b/gbp/git.py
index 6bb6b8bf..c5239599 100644
--- a/gbp/git.py
+++ b/gbp/git.py
@@ -1247,10 +1247,10 @@ class FastImport(object):
try:
self._fi = subprocess.Popen([ 'git', 'fast-import', '--quiet'], stdin=subprocess.PIPE)
self._out = self._fi.stdin
- except OSError, err:
- raise GbpError, "Error spawning git fast-import: %s", err
- except ValueError, err:
- raise GbpError, "Invalid argument when spawning git fast-import: %s", err
+ except OSError as err:
+ raise GbpError("Error spawning git fast-import: %s" % err)
+ except ValueError as err:
+ raise GbpError("Invalid argument when spawning git fast-import: %s" % err)
def _do_data(self, fd, size):
self._out.write("data %s\n" % size)