[X2Go-Commits] x2gothinclient.git - build-main (branch) updated: 1.0.1.8-67-gdf05dba

X2Go dev team git-admin at x2go.org
Fri Jul 19 23:38:12 CEST 2013


The branch, build-main has been updated
       via  df05dba7a9a5f3b183a88af780c25fb6030c0f58 (commit)
      from  d2cc801523e925317f3b3eddde55910075aaf7a1 (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                    |    4 +++-
 x2gothinclient/sbin/x2gothinclientd |    3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index fb55b78..c9ad056 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -71,7 +71,9 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low
     + Update pointer to X2Go TCE documentation on http://wiki.x2go.org.
 
   [ Oleksandr Shneyder ]
-  * modified x2gothinclientd to find /var/lib/x2goclient/.halt
+  * New upstream version (1.0.99.1):
+    - Use expand_file from File::Path::Expand to detect full path
+      of ~x2gothinclient/.halt.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 10 Aug 2012 14:13:49 +0200
 
diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd
index 6a406c3..3ccb7d8 100755
--- a/x2gothinclient/sbin/x2gothinclientd
+++ b/x2gothinclient/sbin/x2gothinclientd
@@ -20,6 +20,7 @@
 
 
 use strict;
+use File::Path::Expand;
 use IPC::Open3;
 
 sub catch_term
@@ -93,7 +94,7 @@ elsif ($pid == 0 )
 	while(sleep 1)
 	{
 		# test if shutdown button on X2Go Client was clicked
-		if ( -e "/var/lib/x2gothinclient/.halt")
+		if (-e expand_file("~x2gothinclient/.halt"))
 		{
 			# when used with plymouth, make sure we stay on the correct terminal
 			system("killall Xorg");


hooks/post-receive
-- 
x2gothinclient.git (X2Go Thin Client Environment)

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 "x2gothinclient.git" (X2Go Thin Client Environment).




More information about the x2go-commits mailing list