[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99-2-131-g5070d10

X2go dev team git-admin at x2go.org
Thu Jul 28 11:09:02 CEST 2011


The branch, master has been updated
       via  5070d10db55dc6fc389aedc1d711c22ddb08f88d (commit)
       via  8d33e20a4c0921e8de364f95af7de5916d3c4b90 (commit)
       via  46e18212748033560a59dcc35faee499c1c08a8f (commit)
       via  96d17b7c17d454d0664a2b29d58fcdec44f1c0ae (commit)
      from  2505b2edd53d8b238198312ecc8a785ed0b009d9 (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 5070d10db55dc6fc389aedc1d711c22ddb08f88d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 28 11:09:03 2011 +0200

    adapting x2golistsessions_root to new $PREFIX/lib/x2go path

commit 8d33e20a4c0921e8de364f95af7de5916d3c4b90
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 28 10:58:59 2011 +0200

    relying on $PATH, not using full paths at all

commit 46e18212748033560a59dcc35faee499c1c08a8f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 28 10:58:23 2011 +0200

    moved x2gosessionlimit to $PREFIX/bin

commit 96d17b7c17d454d0664a2b29d58fcdec44f1c0ae
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 28 10:57:48 2011 +0200

    tab fix

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

Summary of changes:
 x2goserver/{lib => bin}/x2gosessionlimit |    0
 x2goserver/lib/x2godbwrapper.pm          |    2 +-
 x2goserver/lib/x2golistsessions_root     |    4 +++-
 x2goserver/lib/x2gosuspend-agent         |    2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)
 rename x2goserver/{lib => bin}/x2gosessionlimit (100%)

The diff of changes is:
diff --git a/x2goserver/lib/x2gosessionlimit b/x2goserver/bin/x2gosessionlimit
similarity index 100%
rename from x2goserver/lib/x2gosessionlimit
rename to x2goserver/bin/x2gosessionlimit
diff --git a/x2goserver/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm
index 044faac..cf17bb4 100644
--- a/x2goserver/lib/x2godbwrapper.pm
+++ b/x2goserver/lib/x2godbwrapper.pm
@@ -360,7 +360,7 @@ sub db_changestatus
 	}
 	if ($backend eq 'sqlite')
 	{
-	`x2gosqlitewrapper changestatus $status $sid`;
+		`x2gosqlitewrapper changestatus $status $sid`;
 	}
 }
 
diff --git a/x2goserver/lib/x2golistsessions_root b/x2goserver/lib/x2golistsessions_root
index 1e60493..c3c1065 100755
--- a/x2goserver/lib/x2golistsessions_root
+++ b/x2goserver/lib/x2golistsessions_root
@@ -36,6 +36,8 @@ sub check_stat
 	return 1;
 }
 
+my $x2go_lib_path="`dirname $0`/../x2go/lib"
+
 my $uname;
 
 my $serv=shift;
@@ -62,7 +64,7 @@ for (my $i=0;$i<@outp;$i++)
 		{
 			if (!check_stat(@sinfo[1], at sinfo[11]))
 			{
-				system("su - @sinfo[11] -c \"x2gochangestatus 'S' @sinfo[1]\" > /dev/null");
+				system("export X2GO_LIB_PATH=$x2go_lib_path; su - @sinfo[11] -c \"\$X2GO_LIB_PATH/x2gochangestatus 'S' @sinfo[1]\" > /dev/null");
 				@outp[$i] =~ s/\|R\|/\|S\|/;
 			}
 		}
diff --git a/x2goserver/lib/x2gosuspend-agent b/x2goserver/lib/x2gosuspend-agent
index 9ca6d4f..272d819 100755
--- a/x2goserver/lib/x2gosuspend-agent
+++ b/x2goserver/lib/x2gosuspend-agent
@@ -27,4 +27,4 @@ shift;
 my $capt=shift;
 my @words=split(" ",$capt);
 
-system("/usr/bin/x2gosuspend-session @words[2] > /dev/null");
\ No newline at end of file
+system("x2gosuspend-session @words[2] > /dev/null");
\ No newline at end of file


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




More information about the x2go-commits mailing list