[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-rc1-90-g88907cc

[Øyvind H. <go...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  88907cc7f941ce85f0dc35ed3dbc4d2dbc87cef7 (commit)
      from  d746dee833ef4774adcee6a33c97f8039a5bd744 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 88907cc7f941ce85f0dc35ed3dbc4d2dbc87cef7
Author: Øyvind Harboe <oyv...@zy...>
Date:   Fri Jan 8 15:30:10 2010 +0100

    shutdown: more graceful shutdown
    
    Shutdown is not an error condition, do not return error
    from main.
    
    Signed-off-by: Øyvind Harboe <oyv...@zy...>

diff --git a/src/server/server.c b/src/server/server.c
index f762704..173beb8 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -563,9 +563,11 @@ int server_quit(void)
 /* tell the server we want to shut down */
 COMMAND_HANDLER(handle_shutdown_command)
 {
+	LOG_USER("shutdown command invoked");
+
 	shutdown_openocd = 1;
 
-	return ERROR_COMMAND_CLOSE_CONNECTION;
+	return ERROR_OK;
 }
 
 static const struct command_registration server_command_handlers[] = {

-----------------------------------------------------------------------

Summary of changes:
 src/server/server.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository