This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch brokerclient in repository pyhoca-cli. commit 715f739fc5bb6bfc4fa874abaa6ca1abdb4229ea Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Mar 4 13:56:01 2014 +0100 Move --list-profiles code into PyHocaCLI instance. --- pyhoca-cli | 32 ++++++-------------------------- pyhoca/cli/frontend.py | 26 +++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 27 deletions(-) diff --git a/pyhoca-cli b/pyhoca-cli index 93e06ad..71ac0c6 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -391,32 +391,12 @@ if __name__ == '__main__': try: - if args.list_profiles: - - _session_profiles = x2go.X2GoSessionProfiles() - # retrieve a session list - print - print "Available X2Go session profiles" - print "===============================" - print "configuration files: %s" % _session_profiles.config_files - print "user configuration file: %s" % _session_profiles.user_config_file - print - for _profile_id in _session_profiles.profile_ids: - _profile_config = _session_profiles.get_profile_config(_profile_id) - _session_params = _session_profiles.to_session_params(_profile_id) - print 'Profile ID: %s' % _profile_id - print 'Profile Name: %s' % _session_params['profile_name'] - pprint.pprint(_session_params) - print - - else: - - # initialize the X2GoClient context and start the connection to the X2Go server - logger('preparing requested X2Go session', x2go.loglevel_NOTICE, ) - - thisPyHocaCLI = PyHocaCLI(args, logger=logger, liblogger=liblogger) - thisPyHocaCLI.authenticate() - thisPyHocaCLI.MainLoop() + # initialize the X2GoClient context and start the connection to the X2Go server + logger('preparing requested X2Go session', x2go.loglevel_NOTICE, ) + + thisPyHocaCLI = PyHocaCLI(args, logger=logger, liblogger=liblogger) + thisPyHocaCLI.authenticate() + thisPyHocaCLI.MainLoop() sys.exit(0) diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 443d608..f559428 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -341,7 +341,31 @@ class PyHocaCLI(x2go.X2GoClient): self.auth_attempts = int(self.args.auth_attempts) - if self.args.session_profile: + + if args.list_profiles: + + _session_profiles = self._X2GoClient__get_profiles() + # retrieve a session list + print + print "Available X2Go session profiles" + print "===============================" + if _session_profiles.config_files is not None: + print "configuration files: %s" % _session_profiles.config_files + if _session_profiles.user_config_file is not None: + print "user configuration file: %s" % _session_profiles.user_config_file + print + for _profile_id in _session_profiles.profile_ids: + _profile_config = _session_profiles.get_profile_config(_profile_id) + _session_params = _session_profiles.to_session_params(_profile_id) + print 'Profile ID: %s' % _profile_id + print 'Profile Name: %s' % _session_params['profile_name'] + pprint.pprint(_session_params) + print + + # done + sys.exit(0) + + elif self.args.session_profile: _cmdlineopt_to_sessionopt = { 'command': 'cmd', -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-cli.git