[X2Go-Commits] [x2goserver] 01/01: fix for c37724f

git-admin at x2go.org git-admin at x2go.org
Wed Feb 4 20:13:16 CET 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit ebc93db23e840c23d66739c29dceea8883ed6150
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Feb 4 20:12:29 2015 +0100

    fix for c37724f
---
 x2goserver/sbin/x2godbadmin |   20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin
index 6f230d0..dbec03a 100755
--- a/x2goserver/sbin/x2godbadmin
+++ b/x2goserver/sbin/x2godbadmin
@@ -131,12 +131,18 @@ if ($Config->param("backend") eq 'sqlite')
 	{
 		if (! -d "$dir" )
 		{
-			if defined (File::Path::make_path)
+			if ( defined (&File::Path::make_path) )
+			{
 				File::Path::make_path("$dir");
-			elsif defined (File::Path::mkpath)
+			}
+			elsif ( defined (&File::Path::mkpath) )
+			{
 				File::Path::mkpath("$dir");
+			}
 			else
+			{
 				die "Unable to create folders with File::Path";
+			}
 		}
 		if ( -e $dbfile)
 		{
@@ -485,12 +491,18 @@ sub add_user()
 
 	if (! -d "$dir/.x2go" )
 	{
-			if defined (File::Path::make_path)
+			if ( defined (&File::Path::make_path) )
+			{
 				File::Path::make_path("$dir/.x2go");
-			elsif defined (File::Path::mkpath)
+			}
+			elsif ( defined (&File::Path::mkpath) )
+			{
 				File::Path::mkpath("$dir/.x2go");
+			}
 			else
+			{
 				die "Unable to create folders with File::Path";
+			}
 	}
 
 	#save user password

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git


More information about the x2go-commits mailing list