This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch release/4.0.1.x in repository x2goserver. from 724d2ee release 4.0.1.18 new 933d7a2 Continue development... new 34be618 Use File::Which to detect if sshfs command is available before trying to mount a client-side folder. 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 | 12 ++++++++++++ debian/control | 1 + x2goserver.spec | 3 ++- x2goserver/VERSION.x2goserver | 2 +- x2goserver/bin/x2gomountdirs | 12 +++++++++++- x2goserver/man/man5/x2goserver.conf.5 | 2 +- x2goserver/man/man8/x2gobasepath.8 | 2 +- x2goserver/man/man8/x2gocleansessions.8 | 2 +- x2goserver/man/man8/x2gocmdexitmessage.8 | 2 +- x2goserver/man/man8/x2godbadmin.8 | 2 +- x2goserver/man/man8/x2gofeature.8 | 2 +- x2goserver/man/man8/x2gofeaturelist.8 | 2 +- x2goserver/man/man8/x2gogetservers.8 | 2 +- x2goserver/man/man8/x2golistdesktops.8 | 2 +- x2goserver/man/man8/x2golistmounts.8 | 2 +- x2goserver/man/man8/x2golistsessions.8 | 2 +- x2goserver/man/man8/x2golistsessions_root.8 | 2 +- x2goserver/man/man8/x2gomountdirs.8 | 2 +- x2goserver/man/man8/x2gopath.8 | 2 +- x2goserver/man/man8/x2goresume-session.8 | 2 +- x2goserver/man/man8/x2goruncommand.8 | 2 +- x2goserver/man/man8/x2gosessionlimit.8 | 2 +- x2goserver/man/man8/x2gosetkeyboard.8 | 2 +- x2goserver/man/man8/x2goshowblocks.8 | 2 +- x2goserver/man/man8/x2gostartagent.8 | 2 +- x2goserver/man/man8/x2gosuspend-session.8 | 2 +- x2goserver/man/man8/x2goterminate-session.8 | 2 +- x2goserver/man/man8/x2goumount-session.8 | 2 +- x2goserver/man/man8/x2goversion.8 | 2 +- 29 files changed, 51 insertions(+), 27 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 release/4.0.1.x in repository x2goserver. commit 933d7a20904a4b30c09ab630ea440298a56968de Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Oct 7 15:35:52 2014 +0200 Continue development... --- debian/changelog | 6 ++++++ x2goserver.spec | 2 +- x2goserver/VERSION.x2goserver | 2 +- x2goserver/man/man5/x2goserver.conf.5 | 2 +- x2goserver/man/man8/x2gobasepath.8 | 2 +- x2goserver/man/man8/x2gocleansessions.8 | 2 +- x2goserver/man/man8/x2gocmdexitmessage.8 | 2 +- x2goserver/man/man8/x2godbadmin.8 | 2 +- x2goserver/man/man8/x2gofeature.8 | 2 +- x2goserver/man/man8/x2gofeaturelist.8 | 2 +- x2goserver/man/man8/x2gogetservers.8 | 2 +- x2goserver/man/man8/x2golistdesktops.8 | 2 +- x2goserver/man/man8/x2golistmounts.8 | 2 +- x2goserver/man/man8/x2golistsessions.8 | 2 +- x2goserver/man/man8/x2golistsessions_root.8 | 2 +- x2goserver/man/man8/x2gomountdirs.8 | 2 +- x2goserver/man/man8/x2gopath.8 | 2 +- x2goserver/man/man8/x2goresume-session.8 | 2 +- x2goserver/man/man8/x2goruncommand.8 | 2 +- x2goserver/man/man8/x2gosessionlimit.8 | 2 +- x2goserver/man/man8/x2gosetkeyboard.8 | 2 +- x2goserver/man/man8/x2goshowblocks.8 | 2 +- x2goserver/man/man8/x2gostartagent.8 | 2 +- x2goserver/man/man8/x2gosuspend-session.8 | 2 +- x2goserver/man/man8/x2goterminate-session.8 | 2 +- x2goserver/man/man8/x2goumount-session.8 | 2 +- x2goserver/man/man8/x2goversion.8 | 2 +- 27 files changed, 32 insertions(+), 26 deletions(-) diff --git a/debian/changelog b/debian/changelog index ed373f1..95002e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium + + * Continue development... + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Oct 2014 15:35:38 +0200 + x2goserver (4.0.1.18-0x2go1) unstable; urgency=medium [ Horst Schirmeier ] diff --git a/x2goserver.spec b/x2goserver.spec index 70c956b..eaacb85 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,5 +1,5 @@ Name: x2goserver -Version: 4.0.1.18 +Version: 4.0.1.19 Release: 0.0x2go1%{?dist} Summary: X2Go Server diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index 248d822..12e41df 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -4.0.1.18 +4.0.1.19 diff --git a/x2goserver/man/man5/x2goserver.conf.5 b/x2goserver/man/man5/x2goserver.conf.5 index 3858024..766ee39 100644 --- a/x2goserver/man/man5/x2goserver.conf.5 +++ b/x2goserver/man/man5/x2goserver.conf.5 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goserver.conf 5 "Okt 2014" "Version 4.0.1.18" "X2Go Server Configuration" +.TH x2goserver.conf 5 "Okt 2014" "Version 4.0.1.19" "X2Go Server Configuration" .SH NAME x2goserver.conf \- X2Go Server Main Configuration File .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gobasepath.8 b/x2goserver/man/man8/x2gobasepath.8 index a7d849a..ef79274 100644 --- a/x2goserver/man/man8/x2gobasepath.8 +++ b/x2goserver/man/man8/x2gobasepath.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gobasepath 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" +.TH x2gobasepath 8 "Okt 2014" "Version 4.0.1.19" "X2Go Server Tool" .SH NAME x2gobasepath \- Detect Base Path of X2Go Server Installation .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gocleansessions.8 b/x2goserver/man/man8/x2gocleansessions.8 index 9867443..264479d 100644 --- a/x2goserver/man/man8/x2gocleansessions.8 +++ b/x2goserver/man/man8/x2gocleansessions.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gocleansessions 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" +.TH x2gocleansessions 8 "Okt 2014" "Version 4.0.1.19" "X2Go Server Tool" .SH NAME x2gocleansessions \- X2Go Server Cleanup Daemon .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gocmdexitmessage.8 b/x2goserver/man/man8/x2gocmdexitmessage.8 index 4fcca1b..c650c4e 100644 --- a/x2goserver/man/man8/x2gocmdexitmessage.8 +++ b/x2goserver/man/man8/x2gocmdexitmessage.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gocmdexitmessage 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" +.TH x2gocmdexitmessage 8 "Okt 2014" "Version 4.0.1.19" "X2Go Server Tool" .SH NAME x2gocmdexitmessage \- Exit Message of X2Go Command .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2godbadmin.8 b/x2goserver/man/man8/x2godbadmin.8 index b0ffe5b..90bc6b3 100644 --- a/x2goserver/man/man8/x2godbadmin.8 +++ b/x2goserver/man/man8/x2godbadmin.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2godbadmin 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Admin Tool" +.TH x2godbadmin 8 "Okt 2014" "Version 4.0.1.19" "X2Go Server Admin Tool" .SH NAME x2godbadmin \- X2Go Server Database Administrator .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gofeature.8 b/x2goserver/man/man8/x2gofeature.8 index 9f28abe..905d365 100644 --- a/x2goserver/man/man8/x2gofeature.8 +++ b/x2goserver/man/man8/x2gofeature.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gofeature 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" +.TH x2gofeature 8 "Okt 2014" "Version 4.0.1.19" "X2Go Server Tool" .SH NAME x2gofeature \- Query X2Go Feature Availability on X2Go Server .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gofeaturelist.8 b/x2goserver/man/man8/x2gofeaturelist.8 index 73586d7..719403d 100644 --- a/x2goserver/man/man8/x2gofeaturelist.8 +++ b/x2goserver/man/man8/x2gofeaturelist.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gofeaturelist 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" +.TH x2gofeaturelist 8 "Okt 2014" "Version 4.0.1.19" "X2Go Server Tool" .SH NAME x2gofeaturelist \- Query X2Go Feature List for X2Go Server .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gogetservers.8 b/x2goserver/man/man8/x2gogetservers.8 index b1caaf2..0679602 100644 --- a/x2goserver/man/man8/x2gogetservers.8 +++ b/x2goserver/man/man8/x2gogetservers.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gogetservers 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" +.TH x2gogetservers 8 "Okt 2014" "Version 4.0.1.19" "X2Go Server Tool" .SH NAME x2gogetservers \- Retrieve list of available X2Go servers .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2golistdesktops.8 b/x2goserver/man/man8/x2golistdesktops.8 index 0b9eba2..1f1925e 100644 --- a/x2goserver/man/man8/x2golistdesktops.8 +++ b/x2goserver/man/man8/x2golistdesktops.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistdesktops 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" +.TH x2golistdesktops 8 "Okt 2014" "Version 4.0.1.19" "X2Go Server Tool" .SH NAME x2golistdesktops \- List Available X Desktops .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2golistmounts.8 b/x2goserver/man/man8/x2golistmounts.8 index a17100e..836c72a 100644 --- a/x2goserver/man/man8/x2golistmounts.8 +++ b/x2goserver/man/man8/x2golistmounts.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistmounts 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" +.TH x2golistmounts 8 "Okt 2014" "Version 4.0.1.19" "X2Go Server Tool" .SH NAME x2golistmounts \- List Mounted Shares for an X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2golistsessions.8 b/x2goserver/man/man8/x2golistsessions.8 index 0fdee1f..764be2a 100644 --- a/x2goserver/man/man8/x2golistsessions.8 +++ b/x2goserver/man/man8/x2golistsessions.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistsessions 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" +.TH x2golistsessions 8 "Okt 2014" "Version 4.0.1.19" "X2Go Server Tool" .SH NAME x2golistsessions \- List Available X2Go Sessions for User .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2golistsessions_root.8 b/x2goserver/man/man8/x2golistsessions_root.8 index 94482f4..5394b58 100644 --- a/x2goserver/man/man8/x2golistsessions_root.8 +++ b/x2goserver/man/man8/x2golistsessions_root.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistsessions_root 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Admin Tool" +.TH x2golistsessions_root 8 "Okt 2014" "Version 4.0.1.19" "X2Go Server Admin Tool" .SH NAME x2golistsessions_root \- List X2Go Sessions for System .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gomountdirs.8 b/x2goserver/man/man8/x2gomountdirs.8 index 1568e40..41bdd2d 100644 --- a/x2goserver/man/man8/x2gomountdirs.8 +++ b/x2goserver/man/man8/x2gomountdirs.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gomountdirs 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" +.TH x2gomountdirs 8 "Okt 2014" "Version 4.0.1.19" "X2Go Server Tool" .SH NAME x2gomountdirs \- Share Client-Side Folder with X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gopath.8 b/x2goserver/man/man8/x2gopath.8 index 1a00c7b..a7cf914 100644 --- a/x2goserver/man/man8/x2gopath.8 +++ b/x2goserver/man/man8/x2gopath.8 @@ -1,4 +1,4 @@ -.TH x2gopath 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" +.TH x2gopath 8 "Okt 2014" "Version 4.0.1.19" "X2Go Server Tool" .SH Name .PP x2gopath - Show X2Go Server installation paths diff --git a/x2goserver/man/man8/x2goresume-session.8 b/x2goserver/man/man8/x2goresume-session.8 index 34062fb..e0374fa 100644 --- a/x2goserver/man/man8/x2goresume-session.8 +++ b/x2goserver/man/man8/x2goresume-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goresume-session 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" +.TH x2goresume-session 8 "Okt 2014" "Version 4.0.1.19" "X2Go Server Tool" .SH NAME x2goresume-session \- Resume X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goruncommand.8 b/x2goserver/man/man8/x2goruncommand.8 index 9fce592..3a108c8 100644 --- a/x2goserver/man/man8/x2goruncommand.8 +++ b/x2goserver/man/man8/x2goruncommand.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goruncommand 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" +.TH x2goruncommand 8 "Okt 2014" "Version 4.0.1.19" "X2Go Server Tool" .SH NAME x2goruncommand \- Launch Command inside an X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gosessionlimit.8 b/x2goserver/man/man8/x2gosessionlimit.8 index 4ed20ed..7768dca 100644 --- a/x2goserver/man/man8/x2gosessionlimit.8 +++ b/x2goserver/man/man8/x2gosessionlimit.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosessionlimit 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" +.TH x2gosessionlimit 8 "Okt 2014" "Version 4.0.1.19" "X2Go Server Tool" .SH NAME x2gosessionlimit \- Detect Session Limit for User or Group .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gosetkeyboard.8 b/x2goserver/man/man8/x2gosetkeyboard.8 index 70c1cff..41af497 100644 --- a/x2goserver/man/man8/x2gosetkeyboard.8 +++ b/x2goserver/man/man8/x2gosetkeyboard.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosetkeyboard 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool (PyHoca)" +.TH x2gosetkeyboard 8 "Okt 2014" "Version 4.0.1.19" "X2Go Server Tool (PyHoca)" .SH NAME x2gosetkeyboard \- Allow server-side Keyboard Setting Updates issued by X2Go Client .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goshowblocks.8 b/x2goserver/man/man8/x2goshowblocks.8 index 06c281d..9a4423d 100644 --- a/x2goserver/man/man8/x2goshowblocks.8 +++ b/x2goserver/man/man8/x2goshowblocks.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goshowblocks 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" +.TH x2goshowblocks 8 "Okt 2014" "Version 4.0.1.19" "X2Go Server Tool" .SH NAME x2goshowblocks \- Show X2Go-Mounted Block Devices .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gostartagent.8 b/x2goserver/man/man8/x2gostartagent.8 index 9c51eff..d316a79 100644 --- a/x2goserver/man/man8/x2gostartagent.8 +++ b/x2goserver/man/man8/x2gostartagent.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gostartagent 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" +.TH x2gostartagent 8 "Okt 2014" "Version 4.0.1.19" "X2Go Server Tool" .SH NAME x2gostartagent \- Start a New X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gosuspend-session.8 b/x2goserver/man/man8/x2gosuspend-session.8 index cd96906..3395c00 100644 --- a/x2goserver/man/man8/x2gosuspend-session.8 +++ b/x2goserver/man/man8/x2gosuspend-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosuspend-session 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" +.TH x2gosuspend-session 8 "Okt 2014" "Version 4.0.1.19" "X2Go Server Tool" .SH NAME x2gosuspend-session \- Suspend an X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goterminate-session.8 b/x2goserver/man/man8/x2goterminate-session.8 index 5f95843..ba59084 100644 --- a/x2goserver/man/man8/x2goterminate-session.8 +++ b/x2goserver/man/man8/x2goterminate-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goterminate-session 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" +.TH x2goterminate-session 8 "Okt 2014" "Version 4.0.1.19" "X2Go Server Tool" .SH NAME x2goterminate-session \- Terminate an X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goumount-session.8 b/x2goserver/man/man8/x2goumount-session.8 index 183bcaf..808e4c7 100644 --- a/x2goserver/man/man8/x2goumount-session.8 +++ b/x2goserver/man/man8/x2goumount-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goumount-session 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" +.TH x2goumount-session 8 "Okt 2014" "Version 4.0.1.19" "X2Go Server Tool" .SH NAME x2goumount-session \- Unshare mounted Folders from X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goversion.8 b/x2goserver/man/man8/x2goversion.8 index b7a656b..7147560 100644 --- a/x2goserver/man/man8/x2goversion.8 +++ b/x2goserver/man/man8/x2goversion.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goversion 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" +.TH x2goversion 8 "Okt 2014" "Version 4.0.1.19" "X2Go Server Tool" .SH NAME x2goversion \- Retrieve Code Versions of X2Go Server Components .SH SYNOPSIS -- 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 release/4.0.1.x in repository x2goserver. commit 34be618ca89409388dc5ef3704adefbcc566a758 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Oct 7 15:50:20 2014 +0200 Use File::Which to detect if sshfs command is available before trying to mount a client-side folder. --- debian/changelog | 8 +++++++- debian/control | 1 + x2goserver.spec | 1 + x2goserver/bin/x2gomountdirs | 12 +++++++++++- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 95002e4..72fd132 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,12 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium - * Continue development... + * New upstream version (4.0.1.19): + - Use File::Which to detect if sshfs command is available + before trying to mount a client-side folder. + * debian/control: + + Add D (x2goserver): libfile-which-perl. + * x2goserver.spec: + + Add to R: perl(File::Which). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Oct 2014 15:35:38 +0200 diff --git a/debian/control b/debian/control index 2fee7cb..d64bf89 100644 --- a/debian/control +++ b/debian/control @@ -28,6 +28,7 @@ Depends: libdbd-pg-perl, libdbd-sqlite3-perl, libfile-basedir-perl, + libfile-which-perl, libcapture-tiny-perl, adduser, xauth, diff --git a/x2goserver.spec b/x2goserver.spec index eaacb85..e5bc63a 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -48,6 +48,7 @@ Requires: sudo Requires: x2goagent >= 3.5.0.25 Requires: xorg-x11-fonts-misc Requires: xorg-x11-xauth +Requires: perl(File::Which) Requires(pre): shadow-utils Requires(post): grep Requires(post): perl(DBD::SQLite) diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index dc6fc45..8ef6ba0 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -23,6 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); use File::BaseDir qw( xdg_config_home ); +use File::Which; use lib `x2gopath lib`; use x2godbwrapper; @@ -34,6 +35,16 @@ setlogmask( LOG_UPTO(x2gologlevel()) ); syslog('info', "x2gomountdirs has been called with options: @ARGV"); +my $msg; +if (! which ("sshfs") ) { + $msg = "the sshfs command is not installed on this X2Go Server, cannot share client-side folders"; + syslog('warning', "WARNING: $msg"); + print "$msg\n"; + # closing syslog + closelog; + exit 0; +} + sub source_environment { my $name = shift; @@ -62,7 +73,6 @@ my $session=shift; my $user=shift; my $key=shift; my @dl; -my $msg; my $i=0; @dl[$i]=shift; while(@dl[$i]) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org