From bc82714695ab625e83086fed74d9efae5a3873f1 Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Sun, 6 Nov 2011 16:11:25 +0100 Subject: FastImport: robustify exception handling --- gbp/git.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gbp/git.py') diff --git a/gbp/git.py b/gbp/git.py index 6bb6b8b..c523959 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) -- cgit v1.2.3