This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.1.4.0 in repository x2goclient. commit e636fd356c9a1d3da2df9d6d9f4df487b10b28f4 Author: mike <mike@cdb5e8f1-f799-4276-8919-bce57fd91830> Date: Tue Nov 9 09:11:03 2010 +0000 * adapted pyhoca-cli to changes in X2goClient API (strict separation of session profile based methods and session oriented methods) git-svn-id: https://svn.das-netzwerkteam.de/x2go/pyhoca-cli/trunk@39 cdb5e8f1-f799-4276-8919-bce57fd91830 --- pyhoca/cli/frontend.py | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 7401ec8b..5e4459c5 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -191,13 +191,14 @@ class PyHocaCLI(x2go.X2goClient): x2go.X2goClient.__init__(self, logger=liblogger) - if self.args.session_profile and self.has_session_profile(self.args.session_profile): + _session_profiles = self._X2goClient__get_session_profiles() + if self.args.session_profile and _session_profiles.has_profile(self.args.session_profile): - self.x2go_session_hash = self.register_session(profile_name=self.args.session_profile) + self.x2go_session_hash = self._X2goClient__register_session(profile_name=self.args.session_profile) else: - self.x2go_session_hash = self.register_session(args.server, port=int(self.args.remote_ssh_port), + self.x2go_session_hash = self._X2goClient__register_session(args.server, port=int(self.args.remote_ssh_port), username=self.args.username, password=self.args.password, key_filename=self.args.ssh_privkey, @@ -287,31 +288,31 @@ class PyHocaCLI(x2go.X2goClient): profile_name = self.get_profile_name(self.x2go_session_hash) session_name = self.get_session_name(self.x2go_session_hash) - self.logger("X2go session is now running, the X2go client's profile name is: %s." % profile_name, x2go.loglevel_INFO, ) - self.logger("X2go session name is: %s." % session_name, x2go.loglevel_INFO, ) - self.logger("Press CTRL+C to suspend the running session.", x2go.loglevel_NOTICE, ) + self.logger("X2go session is now running, the X2go client's profile name is: %s" % profile_name, x2go.loglevel_INFO, ) + self.logger("X2go session name is: %s" % session_name, x2go.loglevel_INFO, ) + self.logger("Press CTRL+C to suspend the running session...", x2go.loglevel_NOTICE, ) try: session_duration = 0 mounted = False - while self.session_ok(self.x2go_session_hash): + while self._X2goClient__session_ok(self.x2go_session_hash): time.sleep(2) session_duration +=2 # wait a little longer before telling the user what had happened time.sleep(2) - if self.has_terminated(self.x2go_session_hash): - self.logger("X2go session %s has terminated." % session_name, x2go.loglevel_NOTICE, ) - elif self.is_suspended(self.x2go_session_hash): - self.logger("X2go session %s has been suspended." % session_name, x2go.loglevel_NOTICE, ) - elif self.is_running(self.x2go_session_hash): - self.logger("X2go session %s has been moved to a different screen." % session_name, x2go.loglevel_NOTICE, ) + if self._X2goClient__has_terminated(self.x2go_session_hash): + self.logger("X2go session %s has terminated" % session_name, x2go.loglevel_NOTICE, ) + elif self._X2goClient__is_suspended(self.x2go_session_hash): + self.logger("X2go session %s has been suspended" % session_name, x2go.loglevel_NOTICE, ) + elif self._X2goClient__is_running(self.x2go_session_hash): + self.logger("X2go session %s has been moved to a different screen" % session_name, x2go.loglevel_NOTICE, ) except KeyboardInterrupt: - self.logger("Suspending X2go session %s." % session_name, x2go.loglevel_INFO, ) + self.logger("Suspending X2go session %s" % session_name, x2go.loglevel_INFO, ) self._X2goClient__suspend_session(self.x2go_session_hash) # giving nxproxy's SSH tunnel some time to settle time.sleep(2) - self.logger("X2go session %s has been suspended." % session_name, x2go.loglevel_NOTICE, ) + self.logger("X2go session %s has been suspended" % session_name, x2go.loglevel_NOTICE, ) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git