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

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

The branch, twofactorauth has been updated
       via  451748c73bc038c127e89e05e8bb30d5814416aa (commit)
      from  dc1531278cb19352e0744f2bc979022031be01b5 (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/xserver.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/x2go/xserver.py b/x2go/xserver.py
index e239aee..217b577 100644
--- a/x2go/xserver.py
+++ b/x2go/xserver.py
@@ -252,13 +252,14 @@ class X2goXServer(threading.Thread):
                 win32process.TerminateProcess(hProcess, 0)
             except win32process.error:
-                pass
+                self.logger('XServer ,,%s\'\' could not be terminated.' % self.xserver_name, loglevel=log.loglevel_DEBUG)
     def stop_thread(self):
         A call to this method will stop the XServer application and do a cleanup afterwards.
-        self.logger('stop_thread() method has been called', loglevel=log.loglevel_DEBUG)
         self._keepalive = False
+        self.logger('stop_thread() method has been called', loglevel=log.loglevel_DEBUG)

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