[X2Go-Commits] [x2goserver] 01/01: Don't fail in %post during X2Go session DB creation.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2goserver.

commit 7d7935e75793a167687c18aa20aa3359de0ee8c6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Oct 13 16:46:28 2014 +0200

    Don't fail in %post during X2Go session DB creation.
---
 debian/changelog |    1 +
 x2goserver.spec  |    4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 06aa768..64f65eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -103,6 +103,7 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low
     + Make sure X2Go Server (x2gocleansessions) starts after installation.
     + Make sure X2Go session DB files get updated during postinst.
     + Require Perl(Switch) (bin:package x2goserver).
+    + Don't fail in %post during X2Go session DB creation.
 
   [ Guangzhou Nianguan Electronics Technology Co.Ltd. ]
   * New upstream version (4.1.0.0):
diff --git a/x2goserver.spec b/x2goserver.spec
index 71a6326..55b4186 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -351,6 +351,7 @@ exit 0
 %post
 # Initialize the session database
 [ ! -s %{_sharedstatedir}/x2go/x2go_sessions ] &&
+  [ -d %{_datadir}/doc/packages/perl-X2Go-Server-DB ] &&
   egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql >/dev/null 2>&1 &&
   %{_sbindir}/x2godbadmin --createdb >/dev/null 2>&1 || :
 
@@ -384,8 +385,9 @@ fi
 %post -n perl-X2Go-Server-DB
 # Initialize the session database
 [ ! -s %{_sharedstatedir}/x2go/x2go_sessions ] &&
+  [ -x %{_sbindir}/x2godbadmin ] &&
   egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql >/dev/null 2>&1 &&
-  %{_sbindir}/x2godbadmin --createdb >/dev/null 2>&1 || 
+  %{_sbindir}/x2godbadmin --createdb >/dev/null 2>&1 ||
 
 %post fmbindings
 /usr/bin/update-mime-database /usr/share/mime &>/dev/null || :

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