This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 94a359c release 4.0.1.13 (cherry-picked from release/4.0.1.x branch) new 02aaf19 Continue development on main release/4.0.1.x branch... new 4ce8661 Log SSHFS output and errors to ~/.x2go/C-<session>/sshfs-mounts.log. (Fixes: #415). The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 8 ++++++++ x2goserver/bin/x2gomountdirs | 7 ++++--- 2 files changed, 12 insertions(+), 3 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 4ce866113a90c31d2736520361323c60e31c731f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Jan 28 13:44:39 2014 +0100 Log SSHFS output and errors to ~/.x2go/C-<session>/sshfs-mounts.log. (Fixes: #415). Conflicts (resolved by Mike Gabriel): x2goserver/bin/x2gomountdirs --- debian/changelog | 4 +++- x2goserver/bin/x2gomountdirs | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index d8618e0..ffaa5a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -98,7 +98,9 @@ x2goserver (4.1.0.0-0x2go1) UNRELEASED; urgency=low x2goserver (4.0.1.14-0x2go1) UNRELEASED; urgency=low - * Continue development on main release/4.0.1.x branch... + * New upstream release (4.0.1.14): + - Log SSHFS output and errors to ~/.x2go/C-<session>/sshfs-mounts.log. + (Fixes: #415). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 28 Jan 2014 13:41:38 +0100 diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index e17fc84..b545b3a 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -104,9 +104,10 @@ chmod(0600,"$key.ident"); my $mdir="$tmp_dir/.x2go-$ENV{'USER'}/media"; my $ldir="$ENV{'HOME'}/media"; -my $spooldir_lnk="$ENV{'HOME'}/.x2go/C-$session/spool"; +my $sessiondir="$ENV{'HOME'}/.x2go/C-$session"; +my $spooldir_lnk="$sessiondir/spool"; my $spooldir="$tmp_dir/.x2go-$ENV{'USER'}/spool"; -my $mimeboxdir_lnk="$ENV{'HOME'}/.x2go/C-$session/mimebox"; +my $mimeboxdir_lnk="$sessiondir/mimebox"; my $mimeboxdir="$tmp_dir/.x2go-$ENV{'USER'}/mimebox"; source_environment(xdg_config_home() . "/user-dirs.dirs"); @@ -278,7 +279,7 @@ for (my $i=0;$i<@dirs;$i++) print "inserted, $msg\n"; # FIXME: this system call should be converted to a multi-argument system call while pertaining the redirect of stderr to the mounts.log file - if (system("sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 2>>~/mounts.log")==0) + if (system("sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 2>&1 1>>$sessiondir/sshfs-mounts.log")==0) { print "mount @dirs[$i] ok\n"; syslog('notice', "successfully mounted $user\@$host:$port@dirs[$i] to $mntpath"); -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 02aaf19c0f81e9206dde723f2dbd57cf53172c7a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Jan 28 13:42:16 2014 +0100 Continue development on main release/4.0.1.x branch... Conflicts (resolved by Mike Gabriel): debian/changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index a0b0042..d8618e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -96,6 +96,12 @@ x2goserver (4.1.0.0-0x2go1) UNRELEASED; urgency=low -- Reinhard Tartler <siretart@tauware.de> Thu, 20 Dec 2012 10:15:26 +0100 +x2goserver (4.0.1.14-0x2go1) UNRELEASED; urgency=low + + * Continue development on main release/4.0.1.x branch... + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 28 Jan 2014 13:41:38 +0100 + x2goserver (4.0.1.13-0x2go1) unstable; urgency=low * New upstream version (4.0.1.13): -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org