[X2Go-Commits] x2gobroker.git - tmp (branch) updated: 0.0.0.1-26-g36cadfd

X2Go dev team git-admin at x2go.org
Tue Apr 23 21:08:45 CEST 2013


The branch, tmp has been updated
       via  36cadfdd3a58b86b0c0cf79256c446e49a6626c9 (commit)
      from  5dfab3f0e3fd408d2fe24969dd554f9348b62e23 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 sbin/x2gobroker |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/sbin/x2gobroker b/sbin/x2gobroker
index 2e8b5b4..da91b0e 100755
--- a/sbin/x2gobroker
+++ b/sbin/x2gobroker
@@ -61,7 +61,10 @@ if __name__ == "__main__":
 
     if cmdline_args.config_file is not None:
         x2gobroker.defaults.X2GOBROKER_CONFIG = cmdline_args.config_file
-    x2gobroker.defaults.X2GOBROKER_DEBUG = cmdline_args.debug
+
+    # override X2GOBROKER_DEBUG=0 in os.environ with the command line switch
+    if cmdline_args.debug:
+        x2gobroker.defaults.X2GOBROKER_DEBUG = cmdline_args.debug
 
     # some people just give the port but prepend a colon, webpy does not like this, so we strip if off
     cmdline_args.bind = cmdline_args.bind.lstrip(':')


hooks/post-receive
-- 
x2gobroker.git (HTTP(S) Session broker for X2Go)

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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).




More information about the x2go-commits mailing list