The branch, build-main has been updated via 5213ce605d9abaacf576e2df52891c047f2a8e1d (commit) from 623a4649daca7f1489b3441f44f24f5f58db2cfa (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/changelog | 7 +++++++ x2goserver/bin/x2gomountdirs | 2 +- x2goserver/bin/x2goumount-session | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6055676..cf4f5cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +x2goserver (3.1.1.7-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (3.1.1.7): + - Do not fail if source_environment() cannot find the file to be sourced. + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 12 Nov 2012 12:54:05 +0100 + x2goserver (3.1.1.6-0~x2go1) unstable; urgency=low * Bugfix release (3.1.1.6): diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index 457a1d3..8436219 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -38,7 +38,7 @@ sub source_environment { my $name = shift; open my $fh, "<", $name - or die "could not open $name: $!"; + or return -1; while (<$fh>) { chomp; diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index ca52174..33ffc01 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -41,7 +41,7 @@ sub source_environment { my $name = shift; open my $fh, "<", $name - or die "could not open $name: $!"; + or return -1; while (<$fh>) { chomp; 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).