[X2Go-Commits] [x2gobroker] 01/05: fix evoking x2gobroker-daemon-debug

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit c54d6711f52e82079ac51bddac2fe43cf903642f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Nov 28 09:11:21 2014 +0100

    fix evoking x2gobroker-daemon-debug
---
 bin/x2gobroker |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/x2gobroker b/bin/x2gobroker
index af7aaf9..1f9d4be 100755
--- a/bin/x2gobroker
+++ b/bin/x2gobroker
@@ -94,7 +94,7 @@ except ImportError:
 
 from x2gobroker import __VERSION__
 from x2gobroker import __AUTHOR__
-from x2gobroker.loggers import logger_broker, logger_access, logger_error, tornado_log_request
+from x2gobroker.loggers import logger_broker, logger_access, logger_error, tornado_log_request, PROG_NAME
 from x2gobroker.utils import drop_privileges, split_host_address
 
 interactive_mode_warning = False
@@ -176,7 +176,7 @@ if __name__ == "__main__":
         sys.exit(-1)
 
     ### SSH broker
-    elif cmdline_args.mode.upper() == 'SSH':
+    elif cmdline_args.mode.upper() == 'SSH' and not PROG_NAME == 'x2gobroker-daemon':
         if cmdline_args.bind: logger_broker.warn('ignoring non-valid option --bind for broker mode SSH...')
         if cmdline_args.daemonize: logger_broker.warn('ignoring non-valid option --daemonize for broker mode SSH...')
         if cmdline_args.profile_id and cmdline_args.task != 'selectsession':

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git