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 7671d39b37b1f4c0f10ec81b1fb7b96ffe49d000 Author: mike <mike@cdb5e8f1-f799-4276-8919-bce57fd91830> Date: Mon Nov 1 18:33:04 2010 +0000 * using double underscore method names for core methods in X2goClient git-svn-id: https://svn.das-netzwerkteam.de/x2go/pyhoca-cli/trunk@22 cdb5e8f1-f799-4276-8919-bce57fd91830 --- pyhoca/cli/frontend.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 6706c32e..6df99468 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -80,10 +80,10 @@ class PyHocaCLI(x2go.X2goClient): print print "Available runing/suspended X2go sessions" print "========================================" - print "Hostname: [%s]:%s" % self.get_server(s_hash) + print "Host: [%s]:%s" % self.get_server(s_hash) print "Username: %s" % self.get_username(s_hash) print - session_infos = x2go.X2goClient.list_sessions(self, s_hash) + session_infos = self._X2goClient__list_sessions(s_hash) for session_info in session_infos.values(): print "Session Name: %s" % session_info print "-------------" @@ -109,7 +109,7 @@ class PyHocaCLI(x2go.X2goClient): """ # clean all sessions from X2go server self.logger('cleaning up all running sessions from X2go server: %s' % self.args.server, x2go.loglevel_NOTICE, ) - x2go.X2goClient.clean_sessions(self, s_hash) + self._X2goClient__clean_sessions(s_hash) def new_session(self, s_hash): @@ -119,7 +119,7 @@ class PyHocaCLI(x2go.X2goClient): # start a new session and run a command self.logger('starting a new X2go session', x2go.loglevel_INFO, ) self.logger('Command for new session is: %s' % self.args.command, x2go.loglevel_DEBUG, ) - x2go.X2goClient.start_session(self, s_hash) + self._X2goClient__start_session(s_hash) def resume_session(self, s_hash): @@ -128,9 +128,9 @@ class PyHocaCLI(x2go.X2goClient): """ # resume a running session self.logger('resuming X2go session: %s' % self.args.resume, x2go.loglevel_INFO, ) - available_sessions = self.list_sessions(s_hash) + available_sessions = self._X2goClient__list_sessions(s_hash) if self.args.resume in available_sessions.keys(): - x2go.X2goClient.resume_session(self, s_hash, self.args.resume) + self._X2goClient__resume_session(s_hash, self.args.resume) else: self._runtime_error('requested session not available on X2go server [%s]:%s.' % (self.args.server, self.args.remote_ssh_port), exitcode=20) @@ -141,9 +141,9 @@ class PyHocaCLI(x2go.X2goClient): """ # send a suspend request to a session self.logger('requesting X2go session suspend of session: %s' % self.args.suspend, x2go.loglevel_INFO, ) - available_sessions = self.list_sessions(s_hash) + available_sessions = self._X2goClient__list_sessions(s_hash) if self.args.suspend in available_sessions.keys(): - x2go.X2goClient.suspend_session(self, s_hash, self.args.suspend) + self._X2goClient__suspend_session(s_hash, self.args.suspend) else: self._runtime_error('requested session not available on X2go server [%s]:%s.' % (self.args.server, self.args.remote_ssh_port), exitcode=21) @@ -154,9 +154,9 @@ class PyHocaCLI(x2go.X2goClient): """ # send a terminate request to a session self.logger('requesting X2go session terminate of session: %s' % self.args.terminate, x2go.loglevel_INFO, ) - available_sessions = self.list_sessions(s_hash) + available_sessions = self._X2goClient__list_sessions(s_hash) if self.args.terminate in available_sessions.keys(): - x2go.X2goClient.terminate_session(self, s_hash, self.args.terminate) + self._X2goClient__terminate_session(s_hash, self.args.terminate) else: self._runtime_error('requested session not available on X2go server [%s]:%s.' % (self.args.server, self.args.remote_ssh_port), exitcode=22) @@ -245,6 +245,7 @@ class PyHocaCLI(x2go.X2goClient): # finally call the MainLoop of PyHocaCLI if not (self.args.new or self.args.resume): + print 'exiting' sys.exit(0) # give the session some time to come up... @@ -288,7 +289,7 @@ class PyHocaCLI(x2go.X2goClient): except KeyboardInterrupt: self.logger("Suspending X2go session %s." % session_name, x2go.loglevel_INFO, ) - self.suspend_session(self.x2go_session_hash) + 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, ) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git