This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.5.0.1 in repository x2goclient. commit ee08a8ebff88830fbe319be357b0ed15707c0865 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Nov 12 09:06:14 2012 +0100 Remove cmdline option --time-to-wait, Python X2Go now offers a progress status for session startup/resumption. So we query this status instead. --- debian/changelog | 2 ++ man/man1/pyhoca-cli.1 | 3 --- pyhoca-cli | 7 ------- pyhoca/cli/frontend.py | 2 +- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index db87a055..8bb18969 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ pyhoca-cli (0.2.1.0-0~x2go1) UNRELEASED; urgency=low - 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. + - Remove cmdline option --time-to-wait, Python X2Go now offers a progress + status for session startup/resumption. So we query this status instead. * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev@lists.berlios.de>. + Reduce python version in Build-Depends to allow build on Ubuntu 10.04. diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1 index 46b0730f..d88b4862 100644 --- a/man/man1/pyhoca-cli.1 +++ b/man/man1/pyhoca-cli.1 @@ -140,9 +140,6 @@ Use X2Go printing (default: disabled). \*(T<\fB\-\-share-mode\fR \fI{0|1}\fR\*(T> 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. -.TP \*(T<\fB\-\-auth-attempts\fR \fI{0,1,2,3,...}\fR\*(T> Number of interactive authentication attempts in case authentication with the server fails (wrong password?). A value that equals 0 disables interactive authentication completely and requires that a private SSH key has been given on the command line or in the diff --git a/pyhoca-cli b/pyhoca-cli index 8eb9c2f9..4e48dee0 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -165,7 +165,6 @@ x2go_options = [ {'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 = [ @@ -256,12 +255,6 @@ Possible values for the --pack NX option are: if a.username is None and not a.session_profile: a.username = current_user - # time-to-wait needs to be an integer - try: - a.time_to_wait = int(a.time_to_wait) - except ValueError: - runtime_error("--time_to_wait value needs to be an integer value", parser=p, exitcode=80) - if not (a.session_profile or a.list_profiles): # the --server (or --session-profile) option is required for most operations diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 63908e8f..d1fc3416 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -489,7 +489,7 @@ class PyHocaCLI(x2go.X2goClient): 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: + while 0 < self.get_session(self.x2go_session_hash).get_progress_status() < 100: time.sleep(1) i+=1 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git