This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 9971b14 add bug closure for #523 new aff37ca Don't die if no session state file is found, as it will break X2Go completely after upgrading from versions << 4.0.1.16 if sessions are still running/suspended during package upgrade. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: X2Go/Server/Agent/NX.pm | 3 ++- debian/changelog | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit aff37ca6613985c263d160261b9c2e0b959970e2 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jun 27 20:23:19 2014 +0200 Don't die if no session state file is found, as it will break X2Go completely after upgrading from versions << 4.0.1.16 if sessions are still running/suspended during package upgrade. Conflicts (resolved by Mike Gabriel): x2goserver/bin/x2golistsessions x2goserver/sbin/x2gocleansessions x2goserver/sbin/x2golistsessions_root --- X2Go/Server/Agent/NX.pm | 3 ++- debian/changelog | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/X2Go/Server/Agent/NX.pm b/X2Go/Server/Agent/NX.pm index b05f9e0..3b66c31 100644 --- a/X2Go/Server/Agent/NX.pm +++ b/X2Go/Server/Agent/NX.pm @@ -79,7 +79,8 @@ sub get_agent_state my $stateFile = "/tmp/.x2go-".$user."/C-".$sess."/state"; if (! -e $stateFile ) { - die "state file not exists: $stateFile\n"; + print "state file session $sess does not exists: $stateFile\n"; + $state="UNKNOWN"; } else { diff --git a/debian/changelog b/debian/changelog index 056ccd0..26f02bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -163,6 +163,9 @@ x2goserver (4.0.1.16-0x2go1) UNRELEASED; urgency=low them in. - Correctly use diversions from stderr to stdout in shell commands. (Fixes: #520). + - Don't die if no session state file is found, as it will break X2Go + completely after upgrading from versions << 4.0.1.16 if sessions + are still running/suspended during package upgrade. * debian/control, x2goserver.spec: + Update versioned D: x2goagent (>= 3.5.0.25). This assures that X2Go works with poly-instantiated /tmp directories. -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org