This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to annotated tag 0.2.0.3
in repository x2goclient.
commit a92896977c367567119f309411cff500fea1dbaf
Author: Mike Gabriel <mike.gabr...@das-netzwerkteam.de>
Date: Tue Jan 31 23:38:38 2012 +0100
Replace non-code strings ,,X2go'' by ,,X2Go''.
---
README | 4 +--
debian/changelog | 18 ++++++------
man/man1/pyhoca-cli.1 | 44 +++++++++++++++---------------
pyhoca-cli | 54 ++++++++++++++++++------------------
pyhoca/cli/frontend.py | 74 +++++++++++++++++++++++++-------------------------
setup.py | 2 +-
6 files changed, 99 insertions(+), 97 deletions(-)
diff --git a/README b/README
index 5c9985f3..84cba905 100644
--- a/README
+++ b/README
@@ -20,8 +20,8 @@ See http://www.gnu.org/licenses/gpl.html for a recent copy.
=== Current features ===
-* start a new session on an X2go server
-* resume a suspended session on an X2go server
+* start a new session on an X2Go server
+* resume a suspended session on an X2Go server
* suspend a running session (hit Ctrl+C)
* terminate a running session
* retrieve a list of running sessions
diff --git a/debian/changelog b/debian/changelog
index 8f81b525..db59077d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
pyhoca-cli (0.1.4.3-0~x2go1) UNRELEASED; urgency=low
+ * New upstream version (0.1.4.3):
+ - Replace non-code strings ,,X2go'' by ,,X2Go''.
* Add python-suport (>=0.90) as dependency. Fix project name in control
file.
* Add proper license to copyright file.
@@ -33,14 +35,14 @@ pyhoca-cli (0.1.4.0-0~x2go2) unstable; urgency=low
* Already prepare for new upstream version (0.1.4.1):
- README/TODO update.
- * Depend on Python X2go 0.1.1.2.
+ * Depend on Python X2Go 0.1.1.2.
-- Mike Gabriel <mike.gabr...@das-netzwerkteam.de> Tue, 05 Jul 2011 21:22:28
+0200
pyhoca-cli (0.1.4.0-0~x2go4) unstable; urgency=low
* New upstream version (0.1.4.0):
- - Add X2go desktop sharing support.
+ - Add X2Go desktop sharing support.
- Terminate shared desktop sessions of Ctrl-C (instead of
suspending them.
* React to bug #627990, prefer man2html-base over man2html.
@@ -57,7 +59,7 @@ pyhoca-cli (0.1.3.3-0~x2go1) unstable; urgency=low
* new upstream version (0.1.3.3):
- adds man page in html format
- * depending on new Python X2go version (0.1.0.0)
+ * depending on new Python X2Go version (0.1.0.0)
-- Mike Gabriel <mike.gabr...@das-netzwerkteam.de> Thu, 26 May 2011 12:05:11
+0200
@@ -89,14 +91,14 @@ pyhoca-cli (0.1.3.0-0~nwt1) unstable; urgency=low
pyhoca-cli (0.1.3-0~nwt2) lucid maverick testing unstable; urgency=low
- * update Python X2go dependency
+ * update Python X2Go dependency
* added python-setproctitle as dependency
-- Mike Gabriel <m.gabr...@das-netzwerkteam.de> Fri, 31 Dec 2010 01:13:00
+0100
pyhoca-cli (0.1.3-0~nwt1) lucid maverick testing unstable; urgency=low
- * minor fix for new Python X2go version
+ * minor fix for new Python X2Go version
-- Mike Gabriel <m.gabr...@das-netzwerkteam.de> Fri, 31 Dec 2010 00:28:00
+0100
@@ -109,13 +111,13 @@ pyhoca-cli (0.1.2-0~nwt2) lucid maverick testing
unstable; urgency=low
pyhoca-cli (0.1.2-0~nwt1) lucid maverick testing unstable; urgency=low
* disabled use_cache for X2goClient instance
- * depending on Python X2go 0.0.22
+ * depending on Python X2Go 0.0.22
-- Mike Gabriel <m.gabr...@das-netzwerkteam.de> Fri, 10 Dec 2010 13:45:00
+0100
pyhoca-cli (0.1.1-0~nwt1) lucid maverick testing unstable; urgency=low
- * adapted to run with Python X2go v0.0.21
+ * adapted to run with Python X2Go v0.0.21
-- Mike Gabriel <m.gabr...@das-netzwerkteam.de> Thu, 09 Dec 2010 23:30:00
+0100
@@ -134,7 +136,7 @@ pyhoca-cli (0.0.15-0~nwt1) lucid maverick testing unstable;
urgency=low
pyhoca-cli (0.0.14-0~nwt2) lucid maverick testing unstable; urgency=low
- * depending on bugfix Python X2go version 0.0.12 (or higher)
+ * depending on bugfix Python X2Go version 0.0.12 (or higher)
-- Mike Gabriel <m.gabr...@das-netzwerkteam.de> Wed, 13 Oct 2010 14:12:00
+0200
diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1
index 0d267953..efbc0333 100644
--- a/man/man1/pyhoca-cli.1
+++ b/man/man1/pyhoca-cli.1
@@ -5,9 +5,9 @@
\\$2 \(la\\$1\(ra\\$3
..
.if \n(.g .mso www.tmac
-.TH pyhoca-cli 1 "07 Sep 2011" "Version 0.1.4.x" "X2go Application"
+.TH pyhoca-cli 1 "07 Sep 2011" "Version 0.1.4.x" "X2Go Application"
.SH NAME
-pyhoca-cli \- X2go command line client written in Python
+pyhoca-cli \- X2Go command line client written in Python
.SH SYNOPSIS
'nh
.fi
@@ -22,11 +22,11 @@ pyhoca-cli \- X2go command line client written in Python
.ad b
'hy
.SH DESCRIPTION
-\fBpyhoca-cli\fR aims to be a cross-platform (Windows, Mac OS X, Linux) X2go
command line client written
+\fBpyhoca-cli\fR aims to be a cross-platform (Windows, Mac OS X, Linux) X2Go
command line client written
in Python.
.PP
You can use it
-for scripting remote X2go sessions or simply starting, resuming or shadowing
X2go sessions from
+for scripting remote X2Go sessions or simply starting, resuming or shadowing
X2Go sessions from
the command line in a terminal.
.PP
It supports versatile
@@ -50,17 +50,17 @@ No output to stdout at all!
Enable debugging output.
.TP
\*(T<\fB\-\-libdebug\fR\*(T>
-Enable debugging code of the unterlying Python X2go module.
+Enable debugging code of the unterlying Python X2Go module.
.TP
\*(T<\fB\-\-libdebug-sftpxfer\fR\*(T>
Enable debugging code of Python X2go's sFTP server code (very verbose, and it
may even reveal promiscuous data).
.SH SERVER / SESSION PROFILE
You either have to specify a server name or a pre-configured X2goClient
session profile to tell \fBpyhoca-cli\fR to
-what X2go server to connect. \fBpyhoca-cli\fR will not start
+what X2Go server to connect. \fBpyhoca-cli\fR will not start
if neither of these two options has been given on the command line.
.TP
\*(T<\fB\-\-server\fR \fI<HOSTNAME_or_IP>\fR\*(T>
-If not in LDAP mode you always have to name the remote X2go server's hostname
or IP address.
+If not in LDAP mode you always have to name the remote X2Go server's hostname
or IP address.
.TP
\*(T<\fB\-P, \-\-session-profile\fR \fI<SESSION_PROFILE_NAME>\fR\*(T>
The name of the session profile to be used to make the connection.
@@ -68,30 +68,30 @@ The name of the session profile to be used to make the
connection.
\fBpyhoca-cli\fR accepts exclusively one of the listed actions:
.TP
\*(T<\fB\-N, \-\-new\fR\*(T>
-Start a new X2go session on server (default mode if no mode is explicitly
specified).
+Start a new X2Go session on server (default mode if no mode is explicitly
specified).
.TP
\*(T<\fB\-R, \-\-resume\fR \fI<SESSION_NAME>\fR\*(T>
-Resume existing X2go session <SESSION_NAME> on server. Special values for
<SESSION_NAME> are ,,NEWEST'' (will resume youngest session)
+Resume existing X2Go session <SESSION_NAME> on server. Special values for
<SESSION_NAME> are ,,NEWEST'' (will resume youngest session)
or ,,OLDEST'' (resume session with oldest timestamp).
.TP
\*(T<\fB\-D, \-\-share-desktop\fR \fI<USER>@<DISPLAY>\fR\*(T>
-Share an X2go session on the remote server specified by <USER>@<DISPLAY>,
+Share an X2Go session on the remote server specified by <USER>@<DISPLAY>,
whereas <USER> can be the same user that is starting the share mode session or
any
-other user that grants X2go desktop sharing for the current user.
+other user that grants X2Go desktop sharing for the current user.
.TP
\*(T<\fB\-S, \-\-suspend\fR \fI<SESSION_NAME>\fR\*(T>
-Suspend running X2go session <SESSION_NAME>. A special value for
<SESSION_NAME> is ,,ALL'' (will suspend all sessions of the connected user).
+Suspend running X2Go session <SESSION_NAME>. A special value for
<SESSION_NAME> is ,,ALL'' (will suspend all sessions of the connected user).
.TP
\*(T<\fB\-T, \-\-terminate\fR \fI<SESSION_NAME>\fR\*(T>
-Terminate running X2go session <SESSION_NAME>. A special value for
<SESSION_NAME> is ,,ALL'' (will terminate all sessions of the connected user).
+Terminate running X2Go session <SESSION_NAME>. A special value for
<SESSION_NAME> is ,,ALL'' (will terminate all sessions of the connected user).
.TP
\*(T<\fB\-L, \-\-list-sessions\fR\*(T>
-List user's X2go sessions on server.
+List user's X2Go sessions on server.
.SH ACTION OPTIONS
\fBpyhoca-cli\fR actions can be tweaked by these options:
.TP
\*(T<\fB\-\-clean-sessions\fR\*(T>
-Clean all of the user's suspended/running sessions before starting a new one
on the named X2go server.
+Clean all of the user's suspended/running sessions before starting a new one
on the named X2Go server.
.TP
\*(T<\fB\-\-terminate-on-ctrl-c\fR\*(T>
Terminate the connected session when pressing CTRL+C (instead of suspending
the session).
@@ -109,7 +109,7 @@ authentication. The cleartext password that has been
specified at the command li
the systems process list (Linux, MacOS). On Windows systems the usage of the
--password option is forbidden.
.TP
\*(T<\fB\-p, \-\-remote-ssh-port\fR \fI<R_PORT>\fR\*(T>
-Remote X2go server's SSH port (default: 22).
+Remote X2Go server's SSH port (default: 22).
.TP
\*(T<\fB\-k, \-\-ssh-privkey\fR \fI<SSH_PRIVKEY>\fR\*(T>
Use file <SSH_PRIVKEY> as private key for SSH connections (default:
~/.ssh/id_rsa).
@@ -118,16 +118,16 @@ Use file <SSH_PRIVKEY> as private key for SSH connections
(default: ~/.ssh/id_rs
Add RSA/DSA host key to ~/.ssh/known_hosts if authenticity of server can't be
established (default: not set).
.TP
\*(T<\fB\-\-sound\fR \fI{pulse|esd|none}\fR\*(T>
-X2go server's sound system (default: 'pulse').
+X2Go server's sound system (default: 'pulse').
.TP
\*(T<\fB\-F, \-\-share-local-folders\fR \fI<folder1>[,<folder2>[,...]]\fR\*(T>
-A comma separated list of local folders that shall be made available in the
remote X2go session.
+A comma separated list of local folders that shall be made available in the
remote X2Go session.
.TP
\*(T<\fB\-\-printing\fR\*(T>
-Use X2go printing (default: disabled).
+Use X2Go printing (default: disabled).
.TP
\*(T<\fB\-\-share-mode\fR \fI{0|1}\fR\*(T>
-Share mode for X2go desktop sharing (0: view-only, 1: full access).
+Share mode for X2Go desktop sharing (0: view-only, 1: full access).
.TP
\*(T<\fB\-\-time-to-wait\fR\*(T>
Time to wait for session startup/resume (default: 8s). There should be no need
to touch this, unless on very slow network connections.
@@ -161,7 +161,7 @@ Use keyboard layout (default: 'us').
\*(T<\fB\-\-kbd\-type\fR \fI{pc105/us|pc105/de|...}\fR\*(T>
Set Keyboard type (default 'pc105/us').
.SH COMPATIBILITY OPTIONS
-\fBpyhoca-cli\fR aims at being fully compatible with all command line options
and session config files of the X2go project's X2go command
+\fBpyhoca-cli\fR aims at being fully compatible with all command line options
and session config files of the X2Go project's X2Go command
line client \fBx2goclient-cli\fR as well as the \fBx2goclient\fR GUI. This is
still work in progress.
To achieve this, some compatibility options have already
been added:
@@ -196,6 +196,6 @@ rfb-hextile, rfb-tight, rfb-tight-compressed
.SH "SEE ALSO"
\fB/usr/share/doc/python-x2go\fR
.SH AUTHOR
-This manual has been written by for the X2go project (http://www.x2go.org) by
+This manual has been written by for the X2Go project (http://www.x2go.org) by
Mike Gabriel <mike.gabr...@das-netzwerkteam.de>
diff --git a/pyhoca-cli b/pyhoca-cli
index c6752d9c..a21fe0a0 100755
--- a/pyhoca-cli
+++ b/pyhoca-cli
@@ -57,7 +57,7 @@ import getpass
import paramiko
from types import *
-# Python X2go provides the current local username (OS independent)
+# Python X2Go provides the current local username (OS independent)
from x2go.defaults import CURRENT_LOCAL_USER as current_user
from x2go.defaults import X2GO_PRINT_ACTIONS
@@ -71,7 +71,7 @@ from pyhoca.cli import current_home, PyHocaCLI, runtime_error
from pyhoca.cli import __VERSION__ as _version
VERSION=_version
VERSION_TEXT="""
-%s[%s] - an X2go command line client written in Python
+%s[%s] - an X2Go command line client written in Python
----------------------------------------------------------------------
developed by Mike Gabriel <m.gabr...@das-netzwerkteam.de>
@@ -90,21 +90,21 @@ liblogger = x2go.X2goLogger()
# exclusive client control options
action_options = [
- {'args':['-N','--new'], 'default': False, 'action':
'store_true', 'help': 'start a new X2go session on server (default)', },
- {'args':['-R','--resume'], 'default': None, 'metavar':
'SESSION_NAME', 'help': 'resume a suspended X2go session with name
SESSION_NAME', },
- {'args':['-D','--share-desktop'], 'default': None,
'metavar': 'USER@DISPLAY', 'help': 'share an X2go session on server specified
by USER@DISPLAY', },
- {'args':['-S','--suspend'], 'default': None, 'metavar':
'SESSION_NAME', 'help': 'suspend running X2go session SESSION_NAME', },
- {'args':['-T','--terminate'], 'default': None, 'metavar':
'SESSION_NAME', 'help': 'terminate running X2go session SESSION_NAME', },
- {'args':['-L','--list-sessions'], 'default': False,
'action': 'store_true', 'help': 'list user\'s X2go sessions on server', },
- {'args':['--list-desktops'], 'default': False, 'action':
'store_true', 'help': 'list X2go desktop sessions that are available for
sharing', },
- {'args':['-l','--list-profiles'], 'default': False,
'action': 'store_true', 'help': 'list user\'s X2go pre-configured session
profiles', },
+ {'args':['-N','--new'], 'default': False, 'action':
'store_true', 'help': 'start a new X2Go session on server (default)', },
+ {'args':['-R','--resume'], 'default': None, 'metavar':
'SESSION_NAME', 'help': 'resume a suspended X2Go session with name
SESSION_NAME', },
+ {'args':['-D','--share-desktop'], 'default': None,
'metavar': 'USER@DISPLAY', 'help': 'share an X2Go session on server specified
by USER@DISPLAY', },
+ {'args':['-S','--suspend'], 'default': None, 'metavar':
'SESSION_NAME', 'help': 'suspend running X2Go session SESSION_NAME', },
+ {'args':['-T','--terminate'], 'default': None, 'metavar':
'SESSION_NAME', 'help': 'terminate running X2Go session SESSION_NAME', },
+ {'args':['-L','--list-sessions'], 'default': False,
'action': 'store_true', 'help': 'list user\'s X2Go sessions on server', },
+ {'args':['--list-desktops'], 'default': False, 'action':
'store_true', 'help': 'list X2Go desktop sessions that are available for
sharing', },
+ {'args':['-l','--list-profiles'], 'default': False,
'action': 'store_true', 'help': 'list user\'s X2Go pre-configured session
profiles', },
{'args':['-P','--session-profile'], 'default': None,
'help': 'load x2goclient session profiles and use the session profile
SESSION_PROFILE', },
]
# debug options...
debug_options = [
{'args':['-d','--debug'], 'default': False, 'action':
'store_true', 'help': 'enable application debugging code', },
{'args':['--quiet'], 'default': False, 'action':
'store_true', 'help': 'disable any kind of log output', },
- {'args':['--libdebug'], 'default': False, 'action':
'store_true', 'help': 'enable debugging code of the underlying Python X2go
module', },
+ {'args':['--libdebug'], 'default': False, 'action':
'store_true', 'help': 'enable debugging code of the underlying Python X2Go
module', },
{'args':['--libdebug-sftpxfer'], 'default': False,
'action': 'store_true', 'help': 'enable debugging code of Python X2go\'s sFTP
server code (very verbose, and even promiscuous)', },
{'args':['-V', '--version'], 'default': False, 'action':
'store_true', 'help': 'print version number and exit', },
]
@@ -117,20 +117,20 @@ x2go_options = [
{'args':['-p','--remote-ssh-port'], 'default': '22',
'help': 'remote SSH port (default: 22)', },
{'args':['-k','--ssh-privkey'], 'default': None, 'help':
'use file \'SSH_PRIVKEY\' as private key for the SSH connection (e.g.
~/.ssh/id_rsa)', },
{'args':['--add-to-known-hosts'], 'default': False,
'action': 'store_true', 'help': 'add RSA host key fingerprint to
~/.ssh/known_hosts if authenticity of server can\'t be established (default:
not set)', },
- {'args':['--sound'], 'default': 'pulse', 'choices':
('pulse', 'esd', 'none'), 'help': 'X2go server sound system (default:
\'pulse\')', },
- {'args':['--printing'], 'default': False, 'action':
'store_true', 'help': 'use X2go printing (default: disabled)', },
- {'args':['--share-mode'], 'default': 0, 'help': 'share mode
for X2go desktop sharing (0: view-only, 1: full access)', },
- {'args':['-F', '--share-local-folders'], 'metavar':
'<folder1>[,<folder2[,...]]', 'default': None, 'help': 'a comma separated list
of local folder names to mount in the X2go session', },
+ {'args':['--sound'], 'default': 'pulse', 'choices':
('pulse', 'esd', 'none'), 'help': 'X2Go server sound system (default:
\'pulse\')', },
+ {'args':['--printing'], 'default': False, 'action':
'store_true', 'help': 'use X2Go printing (default: disabled)', },
+ {'args':['--share-mode'], 'default': 0, 'help': 'share mode
for X2Go desktop sharing (0: view-only, 1: full access)', },
+ {'args':['-F', '--share-local-folders'], 'metavar':
'<folder1>[,<folder2[,...]]', 'default': None, 'help': 'a comma separated list
of local folder names to mount in the X2Go session', },
{'args':['--clean-sessions'], 'default': False, 'action':
'store_true', 'help': 'clean all suspended sessions before starting a new one',
},
{'args':['--terminate-on-ctrl-c'], 'default': False,
'action': 'store_true', 'help': 'terminate the connected session when pressing
CTRL+C (instead of suspending the session)', },
{'args':['--time-to-wait'], 'default': '8', 'help': 'time
to wait for session startup/resume (default: 8s)', },
{'args':['--auth-attempts'], 'default': 3, 'help': 'number
of authentication attempts before authentication fails (default: 3)', },
]
print_options = [
- {'args':['--print-action'], 'default': 'PDFVIEW',
'choices': PRINT_ACTIONS, 'help': 'action to be performed for incoming X2go
print jobs (default: \'PDFVIEW\')', },
- {'args':['--pdfview-cmd'], 'default': None, 'help': 'PDF
viewer command for displaying incoming X2go print jobs (default: \'%s\'); this
option selects \'--print-action PDFVIEW\'' % DEFAULT_PDFVIEW_CMD,},
+ {'args':['--print-action'], 'default': 'PDFVIEW',
'choices': PRINT_ACTIONS, 'help': 'action to be performed for incoming X2Go
print jobs (default: \'PDFVIEW\')', },
+ {'args':['--pdfview-cmd'], 'default': None, 'help': 'PDF
viewer command for displaying incoming X2Go print jobs (default: \'%s\'); this
option selects \'--print-action PDFVIEW\'' % DEFAULT_PDFVIEW_CMD,},
{'args':['--save-to-folder'], 'default': None, 'metavar':
'PRINT_DEST', 'help': 'save print jobs as PDF files to folder PRINT_DEST
(default: \'%s\'); this option selects \'--print-action PDFSAVE\'' %
DEFAULT_PDFSAVE_LOCATION,},
- {'args':['--printer'], 'default': None, 'help': 'target
CUPS print queue for incoming X2go print jobs (default: CUPS default printer);
this option selects \'--print-action CUPS\'',},
+ {'args':['--printer'], 'default': None, 'help': 'target
CUPS print queue for incoming X2Go print jobs (default: CUPS default printer);
this option selects \'--print-action CUPS\'',},
{'args':['--print-cmd'], 'default': None, 'help': 'print
command including cmd line arguments (default: \'%s\'); this option selects
\'--print-action PRINTCMD\'' % DEFAULT_PRINTCMD_CMD,},
]
nx_options = [
@@ -145,7 +145,7 @@ compat_options = [
{'args':['--port'], 'default': None, 'help': 'compatibility
option, synonymous to --remote-ssh-port PORT', },
{'args':['--ssh-key'], 'default': None, 'help':
'compatibility option, synonymous to --ssh-privkey SSH_KEY', },
{'args':['--use-sound'], 'default': None, 'choices':
('yes', 'no'), 'help': 'compatibility option, synonymous to --sound
{pulse|none}', },
- {'args':['--client-ssh-port'], 'default': None, 'help':
'compatibility option for the x2goclient GUI; as Python X2go brings its own
internal SFTP server, this option will be ignored', },
+ {'args':['--client-ssh-port'], 'default': None, 'help':
'compatibility option for the x2goclient GUI; as Python X2Go brings its own
internal SFTP server, this option will be ignored', },
]
@@ -165,19 +165,19 @@ def parseargs():
global logger
global liblogger
- p = argparse.ArgumentParser(description='X2go command line client
implemented in Python.',\
+ p = argparse.ArgumentParser(description='X2Go command line client
implemented in Python.',\
epilog="""
Possible values for the --pack NX option are:
%s
""" % x2go.defaults.pack_methods_nx3_formatted, \
formatter_class=argparse.RawDescriptionHelpFormatter, \
add_help=True, argument_default=None)
- p_reqargs = p.add_argument_group('X2go server name is always required')
+ p_reqargs = p.add_argument_group('X2Go server name is always required')
p_reqargs.add_argument('--server', help='server hostname or IP address')
p_actionopts = p.add_argument_group('client actions')
p_debugopts = p.add_argument_group('debug options')
- p_x2goopts = p.add_argument_group('X2go options')
- p_printopts = p.add_argument_group('X2go print options')
+ p_x2goopts = p.add_argument_group('X2Go options')
+ p_printopts = p.add_argument_group('X2Go print options')
p_nxopts = p.add_argument_group('NX options')
p_compatopts = p.add_argument_group('compatibility options')
@@ -240,7 +240,7 @@ Possible values for the --pack NX option are:
if not (a.resume or a.share_desktop or a.suspend or a.terminate or
a.list_sessions or a.list_desktops or a.list_profiles):
a.new = True
- # X2go printing
+ # X2Go printing
if ((a.pdfview_cmd and a.printer) or
(a.pdfview_cmd and a.save_to_folder) or
(a.pdfview_cmd and a.print_cmd) or
@@ -344,7 +344,7 @@ if __name__ == '__main__':
_session_profiles = x2go.X2goSessionProfiles()
# retrieve a session list
print
- print "Available X2go session profiles"
+ print "Available X2Go session profiles"
print "==============================="
print "configuration files: %s" % _session_profiles.config_files
print "user configuration file: %s" %
_session_profiles.user_config_file
@@ -359,8 +359,8 @@ if __name__ == '__main__':
else:
- # initialize the X2GoClient context and start the connection to
the X2go server
- logger('preparing requested X2go session', x2go.loglevel_NOTICE, )
+ # 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()
diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index 363d9e92..5d650a3b 100644
--- a/pyhoca/cli/frontend.py
+++ b/pyhoca/cli/frontend.py
@@ -33,7 +33,7 @@ from gevent import socket
# for debugging
import pprint
-# a list of available X2go print actions
+# a list of available X2Go print actions
from x2go.defaults import X2GO_PRINT_ACTIONS
# use current_home as user home dir
@@ -79,7 +79,7 @@ class PyHocaCLI(x2go.X2goClient):
"""
# retrieve a session list
print
- print "Available runing/suspended X2go sessions"
+ print "Available runing/suspended X2Go sessions"
print "========================================"
_peername = self._X2goClient__get_session_server_peername(s_hash)
print "Host: %s - [%s]:%s" %
(self._X2goClient__get_session_server_hostname(s_hash), _peername[0],
_peername[1])
@@ -105,7 +105,7 @@ class PyHocaCLI(x2go.X2goClient):
print "suspended since: %s" % session_info.date_suspended
print
else:
- print "No running/suspended sessions found on X2go server."
+ print "No running/suspended sessions found on X2Go server."
print
def list_desktops(self, s_hash):
@@ -114,7 +114,7 @@ class PyHocaCLI(x2go.X2goClient):
"""
# retrieve a desktop list
print
- print "X2go desktops available for sharing"
+ print "X2Go desktops available for sharing"
print "==================================="
_peername = self._X2goClient__get_session_server_peername(s_hash)
print "Host: %s - [%s]:%s" %
(self._X2goClient__get_session_server_hostname(s_hash), _peername[0],
_peername[1])
@@ -125,13 +125,13 @@ class PyHocaCLI(x2go.X2goClient):
for desktop_name in desktop_list:
print desktop_name
else:
- print "No X2go desktop sessions found that are available for
desktop sharing."
+ print "No X2Go desktop sessions found that are available for
desktop sharing."
print
def list_profiles(self):
# retrieve a session list
print
- print "Available X2go session profiles"
+ print "Available X2Go session profiles"
print "==============================="
_profiles = self._X2goClient__get_profiles()
for _profile_id in _profiles.profile_ids:
@@ -150,8 +150,8 @@ class PyHocaCLI(x2go.X2goClient):
_server = _profiles.get_session_param(self.args.session_profile,
'server')
else:
_server = self.args.server
- # clean all sessions from X2go server
- self.logger('cleaning up all running sessions from X2go server: %s' %
_server, loglevel=x2go.loglevel_NOTICE, )
+ # clean all sessions from X2Go server
+ self.logger('cleaning up all running sessions from X2Go server: %s' %
_server, loglevel=x2go.loglevel_NOTICE, )
self._X2goClient__clean_sessions(s_hash)
def new_session(self, s_hash):
@@ -159,7 +159,7 @@ class PyHocaCLI(x2go.X2goClient):
STILL UNDOCUMENTED
"""
# start a new session and run a command
- self.logger('starting a new X2go session',
loglevel=x2go.loglevel_INFO, )
+ self.logger('starting a new X2Go session',
loglevel=x2go.loglevel_INFO, )
if self.args.session_profile is None:
self.logger('command for new session is: %s' % self.args.command,
loglevel=x2go.loglevel_DEBUG, )
else:
@@ -170,7 +170,7 @@ class PyHocaCLI(x2go.X2goClient):
session_infos = self._X2goClient__list_sessions(s_hash)
if session_infos:
newest_session_name =
x2go.utils.session_names_by_timestamp(session_infos)[-1]
- self._pyhoca_logger("Resuming newest X2go session %s..." %
newest_session_name, loglevel=x2go.loglevel_NOTICE, )
+ self._pyhoca_logger("Resuming newest X2Go session %s..." %
newest_session_name, loglevel=x2go.loglevel_NOTICE, )
self._X2goClient__resume_session(s_hash, newest_session_name)
return True
return False
@@ -179,7 +179,7 @@ class PyHocaCLI(x2go.X2goClient):
session_infos = self._X2goClient__list_sessions(s_hash)
if session_infos:
oldest_session_name =
x2go.utils.session_names_by_timestamp(session_infos)[0]
- self._pyhoca_logger("Resuming oldest X2go session %s..." %
oldest_session_name, loglevel=x2go.loglevel_NOTICE, )
+ self._pyhoca_logger("Resuming oldest X2Go session %s..." %
oldest_session_name, loglevel=x2go.loglevel_NOTICE, )
self._X2goClient__resume_session(s_hash, oldest_session_name)
return True
return False
@@ -189,7 +189,7 @@ class PyHocaCLI(x2go.X2goClient):
STILL UNDOCUMENTED
"""
# resume a running session
- self.logger('resuming X2go session: %s' % self.args.resume,
loglevel=x2go.loglevel_INFO, )
+ self.logger('resuming X2Go session: %s' % self.args.resume,
loglevel=x2go.loglevel_INFO, )
available_sessions = self._X2goClient__list_sessions(s_hash)
if available_sessions and self.args.resume == 'OLDEST':
self._auto_resume_oldest(s_hash)
@@ -198,7 +198,7 @@ class PyHocaCLI(x2go.X2goClient):
elif self.args.resume in available_sessions.keys():
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)
+ self._runtime_error('requested session not available on X2Go
server [%s]:%s' % (self.args.server, self.args.remote_ssh_port), exitcode=20)
def share_desktop_session(self, s_hash):
"""\
@@ -207,7 +207,7 @@ class PyHocaCLI(x2go.X2goClient):
# start a new session and run a command
_desktop = self.args.share_desktop
_share_mode = self.args.share_mode
- self.logger('sharing X2go session: %s' % _desktop,
loglevel=x2go.loglevel_INFO, )
+ self.logger('sharing X2Go session: %s' % _desktop,
loglevel=x2go.loglevel_INFO, )
try:
self._X2goClient__share_desktop_session(s_hash, desktop=_desktop,
share_mode=_share_mode)
except x2go.X2goDesktopSharingException, e:
@@ -219,7 +219,7 @@ class PyHocaCLI(x2go.X2goClient):
STILL UNDOCUMENTED
"""
# send a suspend request to a session
- self.logger('requesting X2go session suspend of session: %s' %
self.args.suspend, loglevel=x2go.loglevel_INFO, )
+ self.logger('requesting X2Go session suspend of session: %s' %
self.args.suspend, loglevel=x2go.loglevel_INFO, )
available_sessions = self._X2goClient__list_sessions(s_hash)
if self.args.suspend == "ALL":
@@ -230,14 +230,14 @@ class PyHocaCLI(x2go.X2goClient):
for _session_name in _session_names:
if _session_name in available_sessions.keys():
self._X2goClient__suspend_session(s_hash, _session_name)
- self._pyhoca_logger("X2go session %s has been suspended" %
_session_name, loglevel=x2go.loglevel_NOTICE, )
+ self._pyhoca_logger("X2Go session %s has been suspended" %
_session_name, loglevel=x2go.loglevel_NOTICE, )
else:
_server = self.args.server
_remote_ssh_port = self.args.remote_ssh_port
if not self.args.server and self.args.session_profile:
_server =
self.session_profiles.get_value(self.session_profiles.to_profile_id(self.args.session_profile),
'host')
_remote_ssh_port =
self.session_profiles.get_value(self.session_profiles.to_profile_id(self.args.session_profile),
'sshport')
- self._runtime_error('session %s not available on X2go server
[%s]:%s' % (_session_name, _server, _remote_ssh_port), exitcode=21)
+ self._runtime_error('session %s not available on X2Go server
[%s]:%s' % (_session_name, _server, _remote_ssh_port), exitcode=21)
def terminate_session(self, s_hash):
"""\
@@ -245,7 +245,7 @@ class PyHocaCLI(x2go.X2goClient):
"""
# send a terminate request to a session
- self.logger('requesting X2go session terminate of session: %s' %
self.args.terminate, loglevel=x2go.loglevel_INFO, )
+ self.logger('requesting X2Go session terminate of session: %s' %
self.args.terminate, loglevel=x2go.loglevel_INFO, )
available_sessions = self._X2goClient__list_sessions(s_hash)
if self.args.terminate == "ALL":
@@ -256,14 +256,14 @@ class PyHocaCLI(x2go.X2goClient):
for _session_name in _session_names:
if _session_name in available_sessions.keys():
self._X2goClient__terminate_session(s_hash, _session_name)
- self._pyhoca_logger("X2go session %s has been terminated" %
_session_name, loglevel=x2go.loglevel_NOTICE, )
+ self._pyhoca_logger("X2Go session %s has been terminated" %
_session_name, loglevel=x2go.loglevel_NOTICE, )
else:
_server = self.args.server
_remote_ssh_port = self.args.remote_ssh_port
if not self.args.server and self.args.session_profile:
_server =
self.session_profiles.get_value(self.session_profiles.to_profile_id(self.args.session_profile),
'host')
_remote_ssh_port =
self.session_profiles.get_value(self.session_profiles.to_profile_id(self.args.session_profile),
'sshport')
- self._runtime_error('session %s not available on X2go server
[%s]:%s' % (_session_name, _server, _remote_ssh_port), exitcode=22)
+ self._runtime_error('session %s not available on X2Go server
[%s]:%s' % (_session_name, _server, _remote_ssh_port), exitcode=22)
def __init__(self, args, logger=None, liblogger=None):
"""\
@@ -277,8 +277,8 @@ class PyHocaCLI(x2go.X2goClient):
self._pyhoca_logger = copy.deepcopy(logger)
self._pyhoca_logger.tag = 'PyHocaCLI'
- # initialize the X2goClient context and start the connection to the
X2go server
- self._pyhoca_logger('preparing requested X2go session',
loglevel=x2go.loglevel_NOTICE, )
+ # initialize the X2goClient context and start the connection to the
X2Go server
+ self._pyhoca_logger('preparing requested X2Go session',
loglevel=x2go.loglevel_NOTICE, )
x2go.X2goClient.__init__(self, logger=liblogger)
@@ -310,7 +310,7 @@ class PyHocaCLI(x2go.X2goClient):
except KeyError:
kwargs[a] = v
- # setup up the session profile based X2go session
+ # setup up the session profile based X2Go session
self.x2go_session_hash =
self._X2goClient__register_session(profile_name=self.args.session_profile,
known_hosts=ssh_known_hosts_filename,
**kwargs
@@ -318,7 +318,7 @@ class PyHocaCLI(x2go.X2goClient):
else:
- # setup up the manually configured X2go session
+ # setup up the manually configured X2Go session
self.x2go_session_hash =
self._X2goClient__register_session(args.server,
port=int(self.args.remote_ssh_port),
known_hosts=ssh_known_hosts_filename,
username=self.args.username,
@@ -398,7 +398,7 @@ class PyHocaCLI(x2go.X2goClient):
if self.args.clean_sessions:
self.clean_sessions(self.x2go_session_hash)
- # go through the possible X2go client modes
+ # go through the possible X2Go client modes
if self.args.list_sessions:
# print a beautified session list for the user
self.list_sessions(self.x2go_session_hash)
@@ -433,7 +433,7 @@ class PyHocaCLI(x2go.X2goClient):
sys.exit(0)
if self.args.resume or self.args.new:
- self._pyhoca_logger("give the X2go session some time to come
up...", loglevel=x2go.loglevel_NOTICE, )
+ self._pyhoca_logger("give the X2Go session some time to come
up...", loglevel=x2go.loglevel_NOTICE, )
i=0
while i < self.args.time_to_wait:
@@ -444,8 +444,8 @@ class PyHocaCLI(x2go.X2goClient):
profile_name =
self._X2goClient__get_session_profile_name(self.x2go_session_hash)
session_name =
self._X2goClient__get_session_name(self.x2go_session_hash)
- self._pyhoca_logger("X2go session is now running, the X2go
client's profile name is: %s" % profile_name, loglevel=x2go.loglevel_INFO, )
- self._pyhoca_logger("X2go session name is: %s" % session_name,
loglevel=x2go.loglevel_INFO, )
+ self._pyhoca_logger("X2Go session is now running, the X2Go
client's profile name is: %s" % profile_name, loglevel=x2go.loglevel_INFO, )
+ self._pyhoca_logger("X2Go session name is: %s" % session_name,
loglevel=x2go.loglevel_INFO, )
if self.args.share_desktop:
self._pyhoca_logger("Press CTRL+C to end desktop sharing
for this session...", loglevel=x2go.loglevel_NOTICE, )
elif self.args.terminate_on_ctrl_c:
@@ -466,30 +466,30 @@ class PyHocaCLI(x2go.X2goClient):
time.sleep(2)
if
self._X2goClient__has_session_terminated(self.x2go_session_hash):
- self._pyhoca_logger("X2go session %s has terminated" %
session_name, loglevel=x2go.loglevel_NOTICE, )
+ self._pyhoca_logger("X2Go session %s has terminated" %
session_name, loglevel=x2go.loglevel_NOTICE, )
elif
self._X2goClient__is_session_suspended(self.x2go_session_hash):
- self._pyhoca_logger("X2go session %s has been
suspended" % session_name, loglevel=x2go.loglevel_NOTICE, )
+ self._pyhoca_logger("X2Go session %s has been
suspended" % session_name, loglevel=x2go.loglevel_NOTICE, )
elif
self._X2goClient__is_session_running(self.x2go_session_hash):
- self._pyhoca_logger("X2go session %s has been moved to
a different screen" % session_name, loglevel=x2go.loglevel_NOTICE, )
+ self._pyhoca_logger("X2Go session %s has been moved to
a different screen" % session_name, loglevel=x2go.loglevel_NOTICE, )
except KeyboardInterrupt:
if self.args.share_desktop:
- self._pyhoca_logger("Terminating X2go shared desktop
session %s" % session_name, loglevel=x2go.loglevel_INFO, )
+ self._pyhoca_logger("Terminating X2Go shared desktop
session %s" % session_name, loglevel=x2go.loglevel_INFO, )
self._X2goClient__terminate_session(self.x2go_session_hash)
time.sleep(2)
- self._pyhoca_logger("X2go session %s has been
terminated" % session_name, loglevel=x2go.loglevel_NOTICE, )
+ self._pyhoca_logger("X2Go session %s has been
terminated" % session_name, loglevel=x2go.loglevel_NOTICE, )
elif self.args.terminate_on_ctrl_c:
- self._pyhoca_logger("Terminating X2go session %s" %
session_name, loglevel=x2go.loglevel_INFO, )
+ self._pyhoca_logger("Terminating X2Go session %s" %
session_name, loglevel=x2go.loglevel_INFO, )
self._X2goClient__terminate_session(self.x2go_session_hash)
# giving nxproxy's SSH tunnel some time to settle
time.sleep(2)
- self._pyhoca_logger("X2go session %s has been
terminated" % session_name, loglevel=x2go.loglevel_NOTICE, )
+ self._pyhoca_logger("X2Go session %s has been
terminated" % session_name, loglevel=x2go.loglevel_NOTICE, )
else:
- self._pyhoca_logger("Suspending X2go session %s" %
session_name, loglevel=x2go.loglevel_INFO, )
+ self._pyhoca_logger("Suspending X2Go session %s" %
session_name, loglevel=x2go.loglevel_INFO, )
self._X2goClient__suspend_session(self.x2go_session_hash)
# giving nxproxy's SSH tunnel some time to settle
time.sleep(2)
- self._pyhoca_logger("X2go session %s has been
suspended" % session_name, loglevel=x2go.loglevel_NOTICE, )
+ self._pyhoca_logger("X2Go session %s has been
suspended" % session_name, loglevel=x2go.loglevel_NOTICE, )
except x2go.X2goSessionException, e:
self._pyhoca_logger("X2goSessionException occured:",
loglevel=x2go.loglevel_ERROR)
diff --git a/setup.py b/setup.py
index e4f18c16..204f8d70 100755
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ import pyhoca.cli
setup(
name = "PyHoca CLI",
version = pyhoca.cli.__VERSION__,
- description = "PyHoca CLI is a cross-platform (Windows, MacOS X, Linux)
X2go client for the command line.",
+ description = "PyHoca CLI is a cross-platform (Windows, MacOS X, Linux)
X2Go client for the command line.",
license = 'GPL',
author = 'Mike Gabriel',
url = 'http://www.x2go.org',
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on
/srv/git/code.x2go.org/x2goclient.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
