This is an automated email from Gerrit.

Juha Niskanen (juha.niska...@haltian.com) just uploaded a new patch set to 
Gerrit, which you can find at http://openocd.zylin.com/2589

-- gerrit

commit 2a3570820a263ec49b3a1ddab43019b86a832bbd
Author: Juha Niskanen <juha.niska...@haltian.com>
Date:   Mon Mar 9 13:28:34 2015 +0200

    helper: shutdown command should return with 0 exit status
    
    Commit a35712a85c42 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.niska...@haltian.com>

diff --git a/src/helper/command.c b/src/helper/command.c
index c29f113..9d19cff 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -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));

-- 

------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the 
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
OpenOCD-devel mailing list
OpenOCD-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openocd-devel

Reply via email to