[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.0.99-2-238-g05cf570
X2Go dev team
git-admin at x2go.org
Fri Jan 3 20:52:33 CET 2014
The branch, build-baikal has been updated
via 05cf570b013f706490bdc170f4b315a208048d70 (commit)
from a19542ba478f9c2968af3470f3af5033affb34ec (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/x2gomountdirs | 1 +
x2goserver/lib/x2godbwrapper.pm | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index 1b62543..9f93e50 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -247,6 +247,7 @@ for (my $i=0;$i<@dirs;$i++)
if (system("sshfs $code_conv -o ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 2>>~/mounts.log")==0)
{
print "mount @dirs[$i] ok\n";
+ syslog('notice', "successfully mounted $user\@$user:@dirs[$i] to $mntpath");
# check if kde4 plasmoid running
my $useplasmoid=0;
if ( -e $plasmstamp )
diff --git a/x2goserver/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm
index e586cf9..cf514e4 100644
--- a/x2goserver/lib/x2godbwrapper.pm
+++ b/x2goserver/lib/x2godbwrapper.pm
@@ -437,7 +437,7 @@ sub db_getports
}
if ($backend eq 'sqlite')
{
- $ports = split("\n",`$x2go_lib_path/x2gosqlitewrapper getports $server`);
+ @ports = split("\n",`$x2go_lib_path/x2gosqlitewrapper getports $server`);
}
my $log_retval = join(" ", @ports);
syslog('debug', "db_getports called, server: $server; return value: $log_retval");
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