[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 0.0.0.5-41-ga72d1e9

X2Go dev team git-admin at x2go.org
Sun May 19 13:03:22 CEST 2013


The branch, build-main has been updated
       via  a72d1e92b9dfdde11637cf1a10022a8685e16075 (commit)
      from  1cd026fbcc45b4688fcc88ea7be6dcc52e6488a7 (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:
 x2gobroker/agent.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py
index 1c83908..23ea1bc 100644
--- a/x2gobroker/agent.py
+++ b/x2gobroker/agent.py
@@ -23,6 +23,7 @@ import subprocess
 import paramiko
 import cStringIO
 import time
+import threading
 
 import x2gobroker._paramiko
 x2gobroker._paramiko.monkey_patch_paramiko()
@@ -224,7 +225,7 @@ def delete_authorized_key(username, pubkey_hash, authorized_keys_file='%h/.x2go/
 
     if delay_deletion > 0:
         delayed_execution(delete_authorized_key, delay=60, username=username, authorized_keys_file=authorized_keys_file, query_mode=query_mode, remote_agent=remote_agent, )
-        logger_broker.debug('Scheduled deletion of authorized key in {delay}: user={user}, host={host}'.format(delay=delay_deletion, user=username, host=_hostname))
+        logger_broker.debug('Scheduled deletion of authorized key in {delay}s: user={user}, host={host}'.format(delay=delay_deletion, user=username, host=_hostname))
     else:
         if query_mode.upper() == u'LOCAL':
             return call_local_broker_agent(username, mode='delauthkey', cmdline_args=[pubkey_hash, authorized_keys_file, ])


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