[X2go-Commits] pyhoca-cli.git - master (branch) updated: 0.2.0.4-12-g7deba53

X2Go dev team git-admin at x2go.org
Sat Nov 10 19:54:49 CET 2012


The branch, master has been updated
       via  7deba5343c345baf7d347c6c6363e870e45c766d (commit)
       via  fd23c68a8afe2c105fc87a0e0de15431af552dc9 (commit)
       via  be31a062f20be2f8070892ca12695193976d17c5 (commit)
      from  506e2e7cf69dc9bc29e10092e3d29739484b41d0 (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 -----------------------------------------------------------------
commit 7deba5343c345baf7d347c6c6363e870e45c766d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Nov 10 19:54:07 2012 +0100

    When finishing the application Update session status before reporting back to the user what happened to the session.

commit fd23c68a8afe2c105fc87a0e0de15431af552dc9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Nov 10 19:48:32 2012 +0100

    fix for last commit

commit be31a062f20be2f8070892ca12695193976d17c5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Nov 10 19:41:47 2012 +0100

    make --from-stdin IPv6 capable

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog       |    2 ++
 pyhoca-cli             |    5 ++---
 pyhoca/cli/frontend.py |    6 ++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 1b63747..31c66dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ pyhoca-cli (0.2.1.0-0~x2go1) UNRELEASED; urgency=low
     - Add cmdline option --from-stdin that facilitates lightdm remote login
       session startup.
     - The option ,,password'' is not allowed for session registration.
+    - When finishing the application Update session status before reporting
+      back to the user what happened to the session.
   * /debian/control:
     + Maintainer change in package: X2Go Developers <x2go-dev at lists.berlios.de>.
     + Reduce python version in Build-Depends to allow build on Ubuntu 10.04.
diff --git a/pyhoca-cli b/pyhoca-cli
index 4998b82..42fe2b6 100755
--- a/pyhoca-cli
+++ b/pyhoca-cli
@@ -375,10 +375,9 @@ Possible values for the --pack NX option are:
 
         lightdm_remote_login_hash = sys.stdin.readline()
         (a.username, a.password, a.server, a.command) = lightdm_remote_login_hash.split()
-        # FIXME: this is not IPv6 capable. As we are preparing a draft, we currently ignore that...
         if ":" in a.server:
-            a.remote_ssh_port = a.server.split(':')[1]
-            a.server = a.server.split(':')[0]
+            a.remote_ssh_port = a.server.split(':')[-1]
+            a.server = ':'.join(a.server.split(':')[:-1])
         a.command = a.command.upper()
         a.geometry = 'fullscreen'
 
diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index 30e55a1..0bffb01 100644
--- a/pyhoca/cli/frontend.py
+++ b/pyhoca/cli/frontend.py
@@ -71,11 +71,9 @@ class PyHocaCLI(x2go.X2goClient):
     """
     x2go_session_hash = None
 
-
     def _runtime_error(self, m, exitcode=-1):
         runtime_error(m, exitcode=exitcode)
 
-
     def list_sessions(self, s_hash):
         """\
         List up server-side available sessions for the logged in user.
@@ -520,6 +518,10 @@ class PyHocaCLI(x2go.X2goClient):
                     # wait a little while before telling the user what has happened
                     time.sleep(2)
 
+                    # refresh session status so we can be most accurate on what we report below
+                    self._X2goClient__list_sessions(self.x2go_session_hash)
+
+                    # report about the session status once we get here...
                     if self._X2goClient__has_session_terminated(self.x2go_session_hash):
                         self._pyhoca_logger("X2Go session %s has terminated" % session_name, loglevel=x2go.loglevel_NOTICE, )
                     elif self._X2goClient__is_session_suspended(self.x2go_session_hash):


hooks/post-receive
-- 
pyhoca-cli.git (Python X2Go Client (command line client))

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 "pyhoca-cli.git" (Python X2Go Client (command line client)).




More information about the x2go-commits mailing list