[X2Go-Commits] python-x2go.git - twofactorauth (branch) updated: fcec1f1a32172fc86b2dceb185ca0c943e3c05f3

X2Go dev team git-admin at x2go.org
Sat Sep 14 15:55:40 CEST 2013


The branch, twofactorauth has been updated
       via  fcec1f1a32172fc86b2dceb185ca0c943e3c05f3 (commit)
      from  473fd7030473f69799c491a161b5281f13599be4 (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:
 x2go/client.py  |    2 +-
 x2go/xserver.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/x2go/client.py b/x2go/client.py
index 8bf016b..bacd3ab 100644
--- a/x2go/client.py
+++ b/x2go/client.py
@@ -240,7 +240,7 @@ class X2goClient(object):
                 self.client_xconfig = X2goClientXConfig(config_files=[_xconfig_config_file], logger=self.logger)
             else:
                 self.client_xconfig = X2goClientXConfig(logger=self.logger)
-            if not self.client_xconfig.known_server:
+            if not self.client_xconfig.known_xservers:
                 self.HOOK_no_known_xserver_found()
             elif not self.client_xconfig.running_xservers:
                 if  type(start_xserver) is types.BooleanType:
diff --git a/x2go/xserver.py b/x2go/xserver.py
index a497c50..ddf5458 100644
--- a/x2go/xserver.py
+++ b/x2go/xserver.py
@@ -196,7 +196,7 @@ class X2goXServer(threading.Thread):
         p = subprocess.Popen(cmd_line, shell=False)
         while self._keepalive:
             gevent.sleep(1)
-        self.logger('killing running XServer ,,%s\'\'' % self.xserver_name, loglevel=log.loglevel_DEBUG)
+        self.logger('terminating running XServer ,,%s\'\'' % self.xserver_name, loglevel=log.loglevel_DEBUG)
         p.terminate()
         
     def stop_thread(self):


hooks/post-receive
-- 
python-x2go.git (Python X2Go Client API)

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 "python-x2go.git" (Python X2Go Client API).




More information about the x2go-commits mailing list