Don't make len(p4Cmd("p4 changes -m 1 //foo/...")) == 0 succeed when the p4 command...

When the p4 command failed write out the exit code in the returned dict.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index f12ad8baffd73b753aa9aec59e278106159d65a3..89a85ebb19aa7c94d04b6ce76c1187d296b42355 100755 (executable)
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -31,7 +31,9 @@ def p4CmdList(cmd):
             result.append(entry)
     except EOFError:
         pass
-    pipe.close()
+    exitCode = pipe.close()
+    if exitCode != None:
+        result["p4ExitCode"] = exitCode
 
     return result