imi415
/
openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

helper: shutdown command should return with 0 exit status 

Commit a35712a85c caused a regression where command

openocd -c "echo a1; shutdown; echo a2"

always returned non-zero exit status to operating system,
even when commands before shutdown all succeeded. This patch
attempt to fix this.

Change-Id: I3f478c2c51d100af810ea0171d2fd4c8fcc657f3
Signed-off-by: Juha Niskanen <juha.niskanen@haltian.com>
Reviewed-on: http://openocd.zylin.com/2589
Tested-by: jenkins
Reviewed-by: Paul Fertser <fercerpav@gmail.com>
This commit is contained in:
Juha Niskanen 2015-03-09 13:28:34 +02:00 committed by Paul Fertser
parent 20fcd0729e
commit 33bb0fe619
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/helper/command.c
View File

@ -660,7 +660,10 @@ int command_run_line(struct command_context *context, char *line)
Jim_DeleteAssocData(interp, "context");
}
if (retcode == JIM_ERR) {
if (retval != ERROR_COMMAND_CLOSE_CONNECTION) {
if (retval == ERROR_COMMAND_CLOSE_CONNECTION) {
/* Shutdown request is not an error */
return ERROR_OK;
} else {
/* We do not print the connection closed error message */
Jim_MakeErrorMessage(interp);
LOG_USER("%s", Jim_GetString(Jim_GetResult(interp), NULL));