summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Simon Hausmann <hausmann@kde.org>2007-02-08 15:45:16 +0100
committerLibravatar Simon Hausmann <hausmann@kde.org>2007-02-08 15:45:16 +0100
commit7315866824607e0a7da807dbee84c60cfe5c5719 (patch)
treeb938e549f86112793160285b62a03d137d6bef32
parentFix calculation of the newest imported revision for #head imports. (diff)
downloadtgif-7315866824607e0a7da807dbee84c60cfe5c5719.tar.xz
Catch io exceptions from git fast-import again and print the error message.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
-rwxr-xr-xcontrib/fast-import/p4-fast-export.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/contrib/fast-import/p4-fast-export.py b/contrib/fast-import/p4-fast-export.py
index 36381fbecd..9f4b16a974 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)