From: Simon Hausmann <hausmann@kde.org>
Date: Thu, 8 Feb 2007 14:45:16 +0000 (+0100)
Subject: Catch io exceptions from git fast-import again and print the error message.
X-Git-Tag: v1.5.3-rc0~65^2^2~219
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7315866824607e0a7da807dbee84c60cfe5c5719;p=git.git

Catch io exceptions from git fast-import again and print the error message.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
---

diff --git a/contrib/fast-import/p4-fast-export.py b/contrib/fast-import/p4-fast-export.py
index 36381fbec..9f4b16a97 100755
--- a/contrib/fast-import/p4-fast-export.py
+++ b/contrib/fast-import/p4-fast-export.py
@@ -230,7 +230,11 @@ else:
         sys.stdout.flush()
         cnt = cnt + 1
 
-        commit(description)
+        try:
+            commit(description)
+        except:
+            print gitError.read()
+            sys.exit(1)
 
     gitStream.close()
     gitOutput.close()
@@ -240,3 +244,4 @@ print ""
 
 os.popen("git-repo-config p4.depotpath %s" % prefix).read()
 
+sys.exit(0)