x2go-commits November 2012

x2go-commits@lists.x2go.org

1 participants
327 discussions

pyhoca-cli.git - master (branch) updated: 0.2.0.4-16-g410289b
by git-admin＠x2go.org 10 Nov '12

10 Nov '12

The branch, master has been updated via 410289b22b14fbb1ddb97be965406c01e384a86f (commit) from 825b50999110441eebcb81782cd79234344ae0c3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 410289b22b14fbb1ddb97be965406c01e384a86f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Nov 10 20:53:50 2012 +0100 update man page ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ man/man1/pyhoca-cli.1 | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 31c66dc..c59505e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,9 @@ pyhoca-cli (0.2.1.0-0~x2go1) UNRELEASED; urgency=low + Reduce python version in Build-Depends to allow build on Ubuntu 10.04. * /debian/rules: + Allow package build on systems with missing dh_python2. + * /man/man1/pyhoca-cli.1: + + Mention keyboard auto detection switch. + + Mention possible geometry value: maximize. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 17 Aug 2012 16:38:54 +0200 diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1 index 002cdd1..1ca92d6 100644 --- a/man/man1/pyhoca-cli.1 +++ b/man/man1/pyhoca-cli.1 @@ -152,7 +152,7 @@ LDAP support is planned to be added into \fBpyhoca-cli\fR in the near future. So .PP .SH NX OPTIONS (Version 3) .TP -\*(T<\fB\-g, \-\-geometry\fR \fI{<WIDTH>x<HEIGHT>|fullscreen}\fR\*(T> +\*(T<\fB\-g, \-\-geometry\fR \fI{<WIDTH>x<HEIGHT>|fullscreen|maximize}\fR\*(T> Screen geometry (default: '800x600'). .TP \*(T<\fB\-q, \-\-link\fR \fI{modem|isdn|adsl|wan|lan}\fR\*(T> @@ -169,8 +169,8 @@ Compression method (see below for possible values). \*(T<\fB\-\-kbd\-layout\fR \fI{us|de|fr|...}\fR\*(T> Use keyboard layout (default: 'us'). .TP -\*(T<\fB\-\-kbd\-type\fR \fI{pc105/us|pc105/de|...}\fR\*(T> -Set Keyboard type (default 'pc105/us'). +\*(T<\fB\-\-kbd\-type\fR \fI{auto|pc105/us|pc105/de|...}\fR\*(T> +Set Keyboard type (default 'pc105/us'). Use \fIauto\fR as value here to enable X2Go's keyboard auto-detection code. .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 line client \fBx2goclient-cli\fR as well as the \fBx2goclient\fR GUI. This is still work in progress. hooks/post-receive -- pyhoca-cli.git (Python X2Go Client (command line client)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-cli.git" (Python X2Go Client (command line client)).

1 0

lightdm-remote-session-x2go.git - master (branch) updated: 15844f38758c435380814e36644434ef50da4e37
by git-admin＠x2go.org 10 Nov '12

10 Nov '12

The branch, master has been updated via 15844f38758c435380814e36644434ef50da4e37 (commit) from 87a1e6fd8e2e8a18a357348455b1bef34ae3a971 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 15844f38758c435380814e36644434ef50da4e37 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Nov 10 20:51:03 2012 +0100 enable X2Go keyboard auto-detection ----------------------------------------------------------------------- Summary of changes: x2go-session.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2go-session.in b/x2go-session.in index 8cf9844..658af13 100755 --- a/x2go-session.in +++ b/x2go-session.in @@ -1,7 +1,7 @@ #!/bin/bash if [ -e ~/.x2go-socket ]; then - @libexecdir@/socket-sucker | /usr/bin/pyhoca-cli --from-stdin --add-to-known-hosts 2>&1 | logger -t lightdm-remote-session-x2go -- + @libexecdir@/socket-sucker | /usr/bin/pyhoca-cli --from-stdin --add-to-known-hosts --kbd-type auto 2>&1 | logger -t lightdm-remote-session-x2go -- else zenity --warning --text="Unable to locate X2GoSession/PyHoca socket" fi; hooks/post-receive -- lightdm-remote-session-x2go.git (X2Go-based remote login session support for LightDM) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "lightdm-remote-session-x2go.git" (X2Go-based remote login session support for LightDM).

1 0

python-x2go.git - master (branch) updated: 0.2.0.10-62-g539c961
by git-admin＠x2go.org 10 Nov '12

10 Nov '12

The branch, master has been updated via 539c961f6f63bc4cc6a4f07ea608b08f060e96c8 (commit) from 84bca5bbc2d00462ad237d375c6555dc4c16d3be (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 539c961f6f63bc4cc6a4f07ea608b08f060e96c8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Nov 10 20:48:13 2012 +0100 fix syntax error ----------------------------------------------------------------------- Summary of changes: x2go/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2go/utils.py b/x2go/utils.py index c032248..0a25fd3 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -587,7 +587,7 @@ def find_session_window(session_name): success = False windowIDs_obj = root.get_full_property(display.intern_atom('_NET_CLIENT_LIST'), Xlib.X.AnyPropertyType) - if windowIDs_obj not None: + if windowIDs_obj is not None: windowIDs = windowIDs_obj.value for windowID in windowIDs: hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

python-x2go.git - master (branch) updated: 0.2.0.10-61-g84bca5b
by git-admin＠x2go.org 10 Nov '12

10 Nov '12

The branch, master has been updated via 84bca5bbc2d00462ad237d375c6555dc4c16d3be (commit) from b3a01ec628bebb147c88ca41a52d699d70f77887 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 84bca5bbc2d00462ad237d375c6555dc4c16d3be Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Nov 10 20:46:37 2012 +0100 convert self.params.cmd to string when testing if command exists ----------------------------------------------------------------------- Summary of changes: x2go/backends/terminal/_stdout.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 458f92c..fd58dde 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -1159,7 +1159,7 @@ class X2goTerminalSessionSTDOUT(object): @rtype: C{tuple} of C{str} """ - if not self.has_command(_rewrite_cmd(self.params.cmd, params=self.params)): + if not self.has_command(_rewrite_cmd(str(self.params.cmd), params=self.params)): if self.client_instance: self.client_instance.HOOK_no_such_command(profile_name=self.profile_name, session_name=self.session_info.name, cmd=self.params.cmd) return False hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

pyhoca-cli.git - master (branch) updated: 0.2.0.4-15-g825b509
by git-admin＠x2go.org 10 Nov '12

10 Nov '12

The branch, master has been updated via 825b50999110441eebcb81782cd79234344ae0c3 (commit) from d8f65485337578f6a0075495b13d9710cb007a1d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 825b50999110441eebcb81782cd79234344ae0c3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Nov 10 20:42:38 2012 +0100 do not hint to STRG-C functionality with --from-stdin option set ----------------------------------------------------------------------- Summary of changes: pyhoca/cli/frontend.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 0bffb01..63908e8 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -499,12 +499,15 @@ class PyHocaCLI(x2go.X2goClient): 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, ) - 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: - self._pyhoca_logger("Press CTRL+C to terminate the running session...", loglevel=x2go.loglevel_NOTICE, ) - else: - self._pyhoca_logger("Press CTRL+C to suspend the running session...", loglevel=x2go.loglevel_NOTICE, ) + + if not self.args.from_stdin: + + 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: + self._pyhoca_logger("Press CTRL+C to terminate the running session...", loglevel=x2go.loglevel_NOTICE, ) + else: + self._pyhoca_logger("Press CTRL+C to suspend the running session...", loglevel=x2go.loglevel_NOTICE, ) try: hooks/post-receive -- pyhoca-cli.git (Python X2Go Client (command line client)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-cli.git" (Python X2Go Client (command line client)).

1 0

python-x2go.git - master (branch) updated: 0.2.0.10-60-gb3a01ec
by git-admin＠x2go.org 10 Nov '12

10 Nov '12

The branch, master has been updated via b3a01ec628bebb147c88ca41a52d699d70f77887 (commit) from b94f81857a38691d156a39338bbe3e139c95433e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b3a01ec628bebb147c88ca41a52d699d70f77887 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Nov 10 20:41:15 2012 +0100 convert the command to be run to string ----------------------------------------------------------------------- Summary of changes: x2go/backends/terminal/_stdout.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 49656ed..458f92c 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -1393,7 +1393,7 @@ class X2goTerminalSessionSTDOUT(object): str(self.params.kbtype), str(setkbd), str(self.params.session_type), - self.params.cmd, + str(self.params.cmd), ] if self.params.cmd == 'XDMCP' and self.params.xdmcp_server: hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

libpam-x2go.git - master (branch) updated: 0ec74159dd1f398df2f174b2d524326b75ebee96
by git-admin＠x2go.org 10 Nov '12

10 Nov '12

The branch, master has been updated via 0ec74159dd1f398df2f174b2d524326b75ebee96 (commit) from 179e19ef771d0c6d12020b89587ef754f7e725ae (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0ec74159dd1f398df2f174b2d524326b75ebee96 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Nov 10 20:38:24 2012 +0100 Revert "let the buffer end with a space character" This reverts commit 179e19ef771d0c6d12020b89587ef754f7e725ae. ----------------------------------------------------------------------- Summary of changes: src/pam-x2go-children.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) The diff of changes is: diff --git a/src/pam-x2go-children.c b/src/pam-x2go-children.c index f9bf18d..e86da1f 100644 --- a/src/pam-x2go-children.c +++ b/src/pam-x2go-children.c @@ -155,9 +155,7 @@ session_socket_handler (struct passwd * pwdent, int readypipe, const char * ruse goto cleanup; } - /* fill the buffer that we will pipe into the .x2go-socket file, the blank at the end of the string is tremendously - important */ - buffer_fill = snprintf(buffer, buffer_len, "%s %s %s %s ", ruser, password, rhost, rdomain); + buffer_fill = snprintf(buffer, buffer_len, "%s %s %s %s", ruser, password, rhost, rdomain); if (buffer_fill > buffer_len) { /* This really shouldn't happen, but if for some reason we have an difference between they way that the lengths are calculated we want hooks/post-receive -- libpam-x2go.git (Remote login session via X2Go (PAM module)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "libpam-x2go.git" (Remote login session via X2Go (PAM module)).

1 0

libpam-x2go.git - master (branch) updated: 179e19ef771d0c6d12020b89587ef754f7e725ae
by git-admin＠x2go.org 10 Nov '12

10 Nov '12

The branch, master has been updated via 179e19ef771d0c6d12020b89587ef754f7e725ae (commit) from 220ba1cfc103ee4f932663fa1d2d956505ad4a94 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 179e19ef771d0c6d12020b89587ef754f7e725ae Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Nov 10 20:33:30 2012 +0100 let the buffer end with a space character ----------------------------------------------------------------------- Summary of changes: src/pam-x2go-children.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/src/pam-x2go-children.c b/src/pam-x2go-children.c index e86da1f..f9bf18d 100644 --- a/src/pam-x2go-children.c +++ b/src/pam-x2go-children.c @@ -155,7 +155,9 @@ session_socket_handler (struct passwd * pwdent, int readypipe, const char * ruse goto cleanup; } - buffer_fill = snprintf(buffer, buffer_len, "%s %s %s %s", ruser, password, rhost, rdomain); + /* fill the buffer that we will pipe into the .x2go-socket file, the blank at the end of the string is tremendously + important */ + buffer_fill = snprintf(buffer, buffer_len, "%s %s %s %s ", ruser, password, rhost, rdomain); if (buffer_fill > buffer_len) { /* This really shouldn't happen, but if for some reason we have an difference between they way that the lengths are calculated we want hooks/post-receive -- libpam-x2go.git (Remote login session via X2Go (PAM module)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "libpam-x2go.git" (Remote login session via X2Go (PAM module)).

1 0

lightdm-remote-session-x2go.git - master (branch) updated: 87a1e6fd8e2e8a18a357348455b1bef34ae3a971
by git-admin＠x2go.org 10 Nov '12

10 Nov '12

The branch, master has been updated via 87a1e6fd8e2e8a18a357348455b1bef34ae3a971 (commit) via 6c01f5952ecb745d8320db81a64e268da138631e (commit) from 2ae50159b27062af358cd7424b9ef62a549c8d38 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 87a1e6fd8e2e8a18a357348455b1bef34ae3a971 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Nov 10 20:26:25 2012 +0100 log pyhoca-cli activity to syslog, add options --add-to-known-hosts commit 6c01f5952ecb745d8320db81a64e268da138631e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Nov 10 20:25:48 2012 +0100 changelog fix ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 ++++--- x2go-session.in | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index fa07892..c865ae4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,10 +2,11 @@ lightdm-remote-session-x2go (0.0.0.1-0~x2go1) UNRELEASED; urgency=low * Initial upstream release. Forked from Canonical's lightdm-remote-session-freerdp (by Ted Gould <ted(a)canonical.com>). - * Be a drop-in replacement for lightdm-remote-session-freerdp for now - until Canonical offers X2Go sessions on - https://uccs.landscape.canonical.com. * /debian/control: + + Be a drop-in replacement for lightdm-remote-session-freerdp for now + until Canonical offers X2Go sessions on + https://uccs.landscape.canonical.com. + -> Thus, conflict with and replace lightdm-remote-session-freerdp. + Versioned dependency on pyhoca-cli (>= 0.2.1.0). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 08 Nov 2012 22:27:37 +0100 diff --git a/x2go-session.in b/x2go-session.in index e95786f..8cf9844 100755 --- a/x2go-session.in +++ b/x2go-session.in @@ -1,7 +1,7 @@ #!/bin/bash if [ -e ~/.x2go-socket ]; then - @libexecdir@/socket-sucker | /usr/bin/pyhoca-cli --from-stdin + @libexecdir@/socket-sucker | /usr/bin/pyhoca-cli --from-stdin --add-to-known-hosts 2>&1 | logger -t lightdm-remote-session-x2go -- else zenity --warning --text="Unable to locate X2GoSession/PyHoca socket" fi; hooks/post-receive -- lightdm-remote-session-x2go.git (X2Go-based remote login session support for LightDM) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "lightdm-remote-session-x2go.git" (X2Go-based remote login session support for LightDM).

1 0

python-x2go.git - master (branch) updated: 0.2.0.10-59-gb94f818
by git-admin＠x2go.org 10 Nov '12

10 Nov '12

The branch, master has been updated via b94f81857a38691d156a39338bbe3e139c95433e (commit) from 66b5505d45f44e1b9a76c33015fdd7543c12310f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b94f81857a38691d156a39338bbe3e139c95433e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Nov 10 20:13:41 2012 +0100 Catch rare condition in utils.find_session_window in case where the list of window IDs is not available. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/utils.py | 18 +++++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 93ead3c..4d5b871 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,8 @@ python-x2go (0.2.1.0-0~x2go1) UNRELEASED; urgency=low forwarding tunneling support in the server's SSH daemon. - Fall back to password auth if agent auth and key discovery fail. - Give the session window more time to appear. + - Catch rare condition in utils.find_session_window in case where + the list of window IDs is not available. * /debian/rules: + Allow package build on systems with missing dh_python2. * /debian/control: diff --git a/x2go/utils.py b/x2go/utils.py index 637b4f2..c032248 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -585,13 +585,17 @@ def find_session_window(session_name): root = display.screen().root success = False - windowIDs = root.get_full_property(display.intern_atom('_NET_CLIENT_LIST'), Xlib.X.AnyPropertyType).value - for windowID in windowIDs: - window = display.create_resource_object('window', windowID) - name = window.get_wm_name() - if name is not None and session_name in name: - success = True - break + windowIDs_obj = root.get_full_property(display.intern_atom('_NET_CLIENT_LIST'), Xlib.X.AnyPropertyType) + + if windowIDs_obj not None: + windowIDs = windowIDs_obj.value + + for windowID in windowIDs: + window = display.create_resource_object('window', windowID) + name = window.get_wm_name() + if name is not None and session_name in name: + success = True + break if success: return window hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits November 2012