[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.1.1.3-88-g5a96410

[X2Go dev team]

The branch, build-baikal has been updated
       via  5a96410dd49dc5a0a46e1b81f2aefb828437e096 (commit)
      from  c264271c18a8ae0ecd4babd9b42c17c518663377 (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:
 X2Go/Utils.pm    |    2 +-
 debian/changelog |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/X2Go/Utils.pm b/X2Go/Utils.pm
index 23a13b3..c0d15b0 100644
--- a/X2Go/Utils.pm
+++ b/X2Go/Utils.pm
@@ -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;
diff --git a/debian/changelog b/debian/changelog
index 0f321b9..1f32b8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,8 @@ x2goserver (3.1.1.7-0~x2go1) UNRELEASED; urgency=low
       command.
     - Detect GNOME and UNITY startup commands via DISTRIB_RELEASE version number
       and by using the bc command for comparing versions.
+    - Do not fail if X2Go::Utils::source_environment() cannot find the file to be
+      sourced.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 12 Nov 2012 09:28:32 +0100
 


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).