x2go-commits June 2013

x2go-commits@lists.x2go.org

1 participants
1546 discussions

python-x2go.git - build-main (branch) updated: 0.4.0.3-7-gf1dc232
by git-admin＠x2go.org 18 Jun '13

18 Jun '13

The branch, build-main has been updated via f1dc23233c1f0b9df67844a8245744e71c00b472 (commit) from b4335679fa7400e2e57c3992f9f25c4d1b719f3c (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/… [View More]changelog | 2 ++ x2go/cache.py | 6 ++++++ 2 files changed, 8 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 589f0b9..4e98b34 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ python-x2go (0.4.0.4-0~x2go1) UNRELEASED; urgency=low session profile configuration if unavailable. (Fixes: #192). - Become aware of fixed paramiko features since paramiko 1.11.0. Stop monkey patching those methods that got fixed in 1.11.0. + - Ignore KeyError exceptions in session cache for suddenly removed cache items. + Silence/fix some race conditions on connection failures. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 21 Apr 2013 23:21:29 +0200 diff --git a/x2go/cache.py b/x2go/cache.py index 389d71a..757b827 100644 --- a/x2go/cache.py +++ b/x2go/cache.py @@ -161,6 +161,8 @@ class X2GoListSessionsCache(object): raise x2go_exceptions.X2GoControlSessionException except x2go_exceptions.X2GoTimeOutException: pass + except KeyError: + pass def _update_desktops(self, profile_name, control_session): """\ @@ -183,6 +185,8 @@ class X2GoListSessionsCache(object): raise x2go_exceptions.X2GoControlSessionException except x2go_exceptions.X2GoTimeOutException: pass + except KeyError: + pass def _update_sessions(self, profile_name, control_session): """\ @@ -201,6 +205,8 @@ class X2GoListSessionsCache(object): del self.x2go_listsessions_cache[profile_name] self.protected = False raise x2go_exceptions.X2GoControlSessionException + except KeyError: + pass def list_sessions(self, session_uuid): """\ 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). [View Less]

1 0

python-x2go.git - master (branch) updated: 0.4.0.3-13-g349717f
by git-admin＠x2go.org 18 Jun '13

18 Jun '13

The branch, master has been updated via 349717f7568a66089965fdce13c5344e6e3a7975 (commit) from 512b72cccbd5ffcdd29917ac68f70286f215483b (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 349717f7568a66089965fdce13c5344e6e3a7975 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

python-x2go.git - master (branch) updated: 0.4.0.3-12-g512b72c
by git-admin＠x2go.org 18 Jun '13

18 Jun '13

The branch, master has been updated via 512b72cccbd5ffcdd29917ac68f70286f215483b (commit) from 22da6eab7545338335e7cef8b3b5a39d2fb786cc (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 512b72cccbd5ffcdd29917ac68f70286f215483b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

x2goserver.git - build-main (branch) updated: 4.0.1.0-2-g06fe412
by git-admin＠x2go.org 17 Jun '13

17 Jun '13

The branch, build-main has been updated via 06fe41242fb4072d2b682aa4b5568ce79dc6bdf2 (commit) from 35915e7891a2a0c01ddf7ff980298ed4457b476b (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/… [View More]changelog | 6 ++++++ x2goserver-compat/VERSION.x2goserver-compat | 2 +- .../VERSION.x2goserver-extensions | 2 +- .../VERSION.x2goserver-fmbindings | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 2 +- x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- x2goserver/VERSION.x2goserver | 2 +- 8 files changed, 13 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8547fc7..0379dfe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2goserver (4.0.1.1-0~x2go1) UNRELEASED; urgency=low + + * Continue development on release/4.0.1.x branch... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 10 Jun 2013 21:28:51 +0200 + x2goserver (4.0.1.0-0~x2go1) unstable; urgency=low * New upstream version (4.0.1.0): diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index 7faf480..df80b37 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -4.0.1.0 \ No newline at end of file +4.0.1.1 \ No newline at end of file diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index 7faf480..df80b37 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -4.0.1.0 \ No newline at end of file +4.0.1.1 \ No newline at end of file diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index 7faf480..df80b37 100644 --- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -1 +1 @@ -4.0.1.0 \ No newline at end of file +4.0.1.1 \ No newline at end of file diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index 7faf480..df80b37 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -4.0.1.0 \ No newline at end of file +4.0.1.1 \ No newline at end of file diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index 7faf480..df80b37 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -4.0.1.0 \ No newline at end of file +4.0.1.1 \ No newline at end of file diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index 7faf480..df80b37 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -4.0.1.0 \ No newline at end of file +4.0.1.1 \ No newline at end of file diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index 7faf480..df80b37 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -4.0.1.0 \ No newline at end of file +4.0.1.1 \ No newline at end of file hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server). [View Less]

1 0

x2goserver.git - build-main (branch) updated: 4.0.1.0-1-g35915e7
by git-admin＠x2go.org 17 Jun '13

17 Jun '13

The branch, build-main has been updated via 35915e7891a2a0c01ddf7ff980298ed4457b476b (commit) from 026f39b4ff047e1d161e09365011160ab7b4545a (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/… [View More]

1 0

x2goserver.git - build-main (branch) updated: 4.0.1.0-3-g1629f60
by git-admin＠x2go.org 17 Jun '13

17 Jun '13

The branch, build-main has been updated via 1629f60722215d87006fc445fc661e1bf6c11b10 (commit) from 06fe41242fb4072d2b682aa4b5568ce79dc6bdf2 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/… [View More]

1 0

x2goserver.git - build-main (branch) updated: 4.0.1.1
by git-admin＠x2go.org 17 Jun '13

17 Jun '13

The branch, build-main has been updated via 9c2ab5674c428fb9417841649b6ebd9f1ca0c503 (commit) from 6333c013ac61ccebe195f8853209c7725ae373b0 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/… [View More]

1 0

x2goserver.git - build-main (branch) updated: 4.0.1.0-4-g6333c01
by git-admin＠x2go.org 17 Jun '13

17 Jun '13

The branch, build-main has been updated via 6333c013ac61ccebe195f8853209c7725ae373b0 (commit) from 1629f60722215d87006fc445fc661e1bf6c11b10 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/… [View More]

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.8-109-g6cbe83c
by git-admin＠x2go.org 14 Jun '13

14 Jun '13

The branch, master has been updated via 6cbe83c867d60bae52823c9a784c515064337a6e (commit) from 97b104e02b2c1d3886740e0450da2a922bcb8519 (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 6cbe83c867d60bae52823c9a784c515064337a6e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Fri Jun 14 19:08:28 2013 +0200 make the x2go_tce_create.sh script (executed inside the chroot during creation) repeatable ----------------------------------------------------------------------- Summary of changes: .../sbin/x2gothinclient_create | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 82b5584..b19a9ac 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -158,10 +158,10 @@ export X2GO_HANDLE_DAEMONS=false [ \$? -eq 0 ] && apt-get install syslinux locales -y [ \$? -eq 0 ] && dpkg-reconfigure locales [ \$? -eq 0 ] && apt-get install linux-image-486 -y -[ \$? -eq 0 ] && mv /vmlinuz /vmlinuz.486.tmp -[ \$? -eq 0 ] && LINK_TARGET=\$(readlink /vmlinuz.486.tmp | sed 's@/boot@boot@') && ln -s \$LINK_TARGET /vmlinuz.486 && rm -f /vmlinuz.486.tmp -[ \$? -eq 0 ] && mv /initrd.img /initrd.img.486.tmp -[ \$? -eq 0 ] && LINK_TARGET=\$(readlink /initrd.img.486.tmp | sed 's@/boot@boot@') && ln -s \$LINK_TARGET /initrd.img.486 && rm -f /initrd.img.486.tmp +[ \$? -eq 0 ] && test -e /vmlinuz && mv /vmlinuz /vmlinuz.486.tmp || true +[ \$? -eq 0 ] && LINK_TARGET=\$(readlink /vmlinuz.486.tmp | sed 's@/boot@boot@') && ln -sf \$LINK_TARGET /vmlinuz.486 && rm -f /vmlinuz.486.tmp +[ \$? -eq 0 ] && test -e /vmlinuz && mv /initrd.img /initrd.img.486.tmp || true +[ \$? -eq 0 ] && LINK_TARGET=\$(readlink /initrd.img.486.tmp | sed 's@/boot@boot@') && ln -sf \$LINK_TARGET /initrd.img.486 && rm -f /initrd.img.486.tmp [ \$? -eq 0 ] && apt-get install alsa-base pulseaudio -y [ \$? -eq 0 ] && apt-get install patch -y @@ -192,8 +192,8 @@ export X2GO_HANDLE_DAEMONS=false # tweak plymouth [ \$? -eq 0 ] && apt-get install plymouth plymouth-themes-all -y [ \$? -eq 0 ] && test -e /etc/os-release && sed -e 's/PRETTY_NAME=.*/PRETTY_NAME=$TC_PRETTY_NAME/' -i /etc/os-release || echo "PRETTY_NAME=$TC_PRETTY_NAME" >> /etc/os-release -[ \$? -eq 0 ] && test -e /etc/modprobe.d/i915-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/i915-kms.conf -[ \$? -eq 0 ] && test -e /etc/modprobe.d/radeon-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/radeon-kms.conf +[ \$? -eq 0 ] && test -e /etc/modprobe.d/i915-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/i915-kms.conf || true +[ \$? -eq 0 ] && test -e /etc/modprobe.d/radeon-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/radeon-kms.conf || true EOF chmod u+x $TC_CHROOT/x2go_tce_install.sh hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment). [View Less]

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.8-108-g97b104e
by git-admin＠x2go.org 14 Jun '13

14 Jun '13

The branch, master has been updated via 97b104e02b2c1d3886740e0450da2a922bcb8519 (commit) from 60828dfaef5985930251df0e1de5c5e8ee868c56 (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 97b104e02b2c1d3886740e0450da2a922bcb8519 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Fri Jun 14 18:34:38 2013 +0200 some more/better quoting for security reasons ----------------------------------------------------------------------- Summary of changes: .../sbin/x2gothinclient_cleanup | 2 +- .../sbin/x2gothinclient_create | 8 ++++---- x2gothinclientmanagement/sbin/x2gothinclient_shell | 8 ++++---- .../sbin/x2gothinclient_upgrade | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) The diff of changes is: diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_cleanup b/x2gothinclientmanagement/sbin/x2gothinclient_cleanup index 984b3e2..5157fb6 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_cleanup +++ b/x2gothinclientmanagement/sbin/x2gothinclient_cleanup @@ -55,7 +55,7 @@ read # make sure, all chroot-internal mountpoints are gone... for mountpoint in proc dev/pts sys; do while true; do - cat /proc/mounts | grep "$TC_CHROOT/$mountpoint" >/dev/null && umount "$TC_CHROOT/$mountpoint" || break + cat /proc/mounts | grep "$TC_CHROOT/$mountpoint" >/dev/null && umount "$TC_CHROOT/$mountpoint" || break done done diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index fdaa1fd..82b5584 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -198,10 +198,10 @@ export X2GO_HANDLE_DAEMONS=false EOF chmod u+x $TC_CHROOT/x2go_tce_install.sh -mkdir -p $TC_CHROOT/{proc,dev/pts,sys} -mount -tproc proc $TC_CHROOT/proc || true -mount -tsysfs sys $TC_CHROOT/sys || true -mount -tdevpts devpts $TC_CHROOT/dev/pts || true +mkdir -p "$TC_CHROOT/"{proc,dev/pts,sys} +mount -tproc proc "$TC_CHROOT/proc" || true +mount -tsysfs sys "$TC_CHROOT/sys" || true +mount -tdevpts devpts "$TC_CHROOT/dev/pts" || true chroot $TC_CHROOT /x2go_tce_install.sh diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index 736776e..42f4f5d 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -92,10 +92,10 @@ echo EOF chmod u+x "$TC_CHROOT/x2go_tce_shell.sh" -mkdir -p $TC_CHROOT/{proc,dev/pts,sys} -mount | grep $TC_CHROOT/proc >/dev/null || mount -tproc proc $TC_CHROOT/proc || true -mount | grep $TC_CHROOT/sys >/dev/null || mount -tsysfs sys $TC_CHROOT/sys || true -mount | grep $TC_CHROOT/dev/pts >/dev/null || mount -tdevpts devts $TC_CHROOT/dev/pts || true +mkdir -p "$TC_CHROOT/"{proc,dev/pts,sys} +mount | grep "$TC_CHROOT/proc" >/dev/null || mount -tproc proc "$TC_CHROOT/proc" || true +mount | grep "$TC_CHROOT/sys" >/dev/null || mount -tsysfs sys "$TC_CHROOT/sys" || true +mount | grep "$TC_CHROOT/dev/pts" >/dev/null || mount -tdevpts devts "$TC_CHROOT/dev/pts" || true cp "$TC_CHROOT/etc/resolv.conf" "$TC_CHROOT/etc/resolv.conf.disabled-by-x2go" test -f /etc/resolv.conf && cp /etc/resolv.conf "$TC_CHROOT/etc/resolv.conf" diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade index a53c183..16abcc5 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade @@ -91,10 +91,10 @@ echo EOF chmod u+x "$TC_CHROOT/x2go_tce_upgrade.sh" -mkdir -p $TC_CHROOT/{proc,dev/pts,sys} -mount | grep $TC_CHROOT/proc >/dev/null || mount -tproc proc $TC_CHROOT/proc || true -mount | grep $TC_CHROOT/sys >/dev/null || mount -tsysfs sys $TC_CHROOT/sys || true -mount | grep $TC_CHROOT/dev/pts >/dev/null || mount -tdevpts devts $TC_CHROOT/dev/pts || true +mkdir -p "$TC_CHROOT/"{proc,dev/pts,sys} +mount | grep "$TC_CHROOT/proc" >/dev/null || mount -tproc proc "$TC_CHROOT/proc" || true +mount | grep "$TC_CHROOT/sys" >/dev/null || mount -tsysfs sys "$TC_CHROOT/sys" || true +mount | grep "$TC_CHROOT/dev/pts" >/dev/null || mount -tdevpts devts "$TC_CHROOT/dev/pts" || true chroot "$TC_CHROOT" /x2go_tce_upgrade.sh hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment). [View Less]

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
155
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits June 2013