x2goserver.git - master (branch) updated: 3.0.99.10-6-g2cffebd - x2go-commits

13 Feb 2012

The branch, master has been updated
       via  2cffebd0aab22890d25a3f7539068c95087e9a2e (commit)
      from  8ac7d8934719d90fcd35769836c02c3e3a54f85b (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 2cffebd0aab22890d25a3f7539068c95087e9a2e
Author: Sören Plönnings <ploennings@tet.uni-hannover.de>
Date:   Mon Feb 13 14:14:39 2012 +0100

    Only run kdialog/zenity from x2goumount-session if either of them exists in the system's $PATH.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                  |    5 +++++
 x2goserver/bin/x2goumount-session |    4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index 7c7c7e0..bdb4fdf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,11 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low
     - Fix removal of desktop link on x2goumount-session if local folder of a
       Windows client gets unmounted.
 
+  [ Sören Plönnigs ]
+  * New upstream version (3.1.0.0):
+    - Only run kdialog/zenity from x2goumount-session if either of them exists
+      in the system's $PATH.
+
  -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Wed, 01 Feb 2012 13:45:00 +0100
 
 x2goserver (3.0.99.10-0~x2go1) unstable; urgency=low
diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session
index bc163fa..bf62f82 100755
--- a/x2goserver/bin/x2goumount-session
+++ b/x2goserver/bin/x2goumount-session
@@ -113,11 +113,11 @@ break:
 			syslog('err', "ERROR: failed to unmount @line[1]");
 			if ($use_zenity == 0)
 			{
-				system("kdialog --error \"@line[1]\"&");
+				system("which kdialog &>/dev/null && kdialog --error \"@line[1]\"&");
 			}
 			else
 			{
-				system("zenity --error --text \"@line[1]\"&");
+				system("which zenity &>/dev/null && zenity --error --text \"@line[1]\"&");
 			}
 		}
 	}


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

    