diff options
| author |  Simon Hausmann <shausman@trolltech.com> | 2007-05-23 23:27:31 +0200 |
|---|---|---|
| committer | Simon Hausmann <shausman@trolltech.com> | 2007-05-23 23:29:01 +0200 |
| commit | a6d5da36af9a7087cf14e717b72c66ef2c34eb3b (patch) | |
| tree | c3941b4e43d55713e95d56bd08f2fe9cf1bdff2a | |
| parent | Make rollback work with locally imported branches (diff) | |
| download | tgif-a6d5da36af9a7087cf14e717b72c66ef2c34eb3b.tar.xz | |
Don't make len(p4Cmd("p4 changes -m 1 //foo/...")) == 0 succeed when the p4 command itself failed.
When the p4 command failed write out the exit code in the returned dict.
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
| -rwxr-xr-x | contrib/fast-import/git-p4 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index f12ad8baff..89a85ebb19 100755 --- 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 |