[X2Go-Commits] x2goserver.git - build-main (branch) updated: 3.0.99-2-252-g858bba0

[X2Go dev team]

The branch, build-main has been updated
       via  858bba095723b6b801ae975ac8f89651cc737ad9 (commit)
      from  bb802fa01525d261d92e6bed6bf56a7a11e4fea9 (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:
 x2goserver/bin/x2goumount-session |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session
index f63ee36..c69cd2c 100755
--- a/x2goserver/bin/x2goumount-session
+++ b/x2goserver/bin/x2goumount-session
@@ -89,6 +89,7 @@ for ($i=0;$i<@outp;$i++)
 		if (@mounts[$j]=~m/sshfs/ && @mounts[$j]=~m/@line[0]/ && @mounts[$j]=~m/@line[1]/ )
 		{
 			$found=1;
+			syslog('debug', "found mount point for @mounts[$j]");
 			$remote=(split(" ", at mounts[$j]))[0];
 			goto break;
 		}
@@ -98,11 +99,13 @@ break:
 	{
 		if (system( "fusermount -u @line[1]" ) == 0)
 		{
+			syslog('notice', "successfully mounted @line[1]");
 			$found=0;
 		}
 		else
 		{
 			$ENV{'DISPLAY'}=":$display";
+			syslog('err', "ERROR: failed to unmount @line[1]");
 			if ($use_zenity == 0)
 			{
 				system("kdialog --error \"@line[1]\"&");
@@ -120,15 +123,18 @@ break:
 		$remote="$ENV{'HOME'}/Desktop/$remote";
 		if ( -e "$remote(sshfs-disk)")
 		{
-		   unlink("$remote(sshfs-disk)");
+		    syslog('info', "removing desktop icon $remote(sshfs-disk)");
+		    unlink("$remote(sshfs-disk)");
 		}
 		$remote=~s/%2framdrive%2fmnt%2f//;
 		if ( -e "$remote(sshfs-removable)")
 		{
+			syslog('info', "removing desktop icon $remote(sshfs-removable)");
 			unlink("$remote(sshfs-removable)");
 		}
 		if ( -e "$remote(sshfs-cdrom)")
 		{
+			syslog('info', "removing desktop icon $remote(sshfs-cdrom)");
 			unlink("$remote(sshfs-cdrom)");
 		}
 		db_deletemount ($session, @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).