[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-304-gd80cc0b

[X2Go dev team]

The branch, master has been updated
       via  d80cc0b8ac1e353c6a0aafc81d8400bb3ce02d1a (commit)
      from  562749b4b38be975f648677003dc99a6dfb54bb0 (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 -----------------------------------------------------------------
commit d80cc0b8ac1e353c6a0aafc81d8400bb3ce02d1a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Dec 17 13:29:39 2013 +0100

    Assure that SQLite3 session DB file gets created on install (unless PostgreSQL is used as session DB backend).

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    2 ++
 x2goserver.spec  |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 3fff745..0b7cfeb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,6 +60,8 @@ x2goserver (4.1.0.0-0x2go1) UNRELEASED; urgency=low
     + Use deprected %{_initrddir} macro for EPEL-5 builds.
     + Take advantage of native RHEL support (since 4.0.1.10).
     + Install SQLite3 wrapper as setgid x2gouser. (Fixes: 371).
+    + Assure that SQLite3 session DB file gets created on install (unless
+      PostgreSQL is used as session DB backend).
 
   [ Guangzhou Nianguan Electronics Technology Co.Ltd. ]
   * New upstream version (4.1.0.0):
diff --git a/x2goserver.spec b/x2goserver.spec
index 1c4e121..70e006e 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -307,7 +307,7 @@ exit 0
 
 %post
 # Initialize the session database (first attempt, may fail if perl-X2Go-Server-DB is not yet installed
-[ ! -f %{_sharedstatedir}/x2go/x2go_sessions ] &&
+[ ! -s %{_sharedstatedir}/x2go/x2go_sessions ] && egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql 1>/dev/null 2>/dev/null &&
   %{_sbindir}/x2godbadmin --createdb 1>/dev/null 2>/dev/null || :
 
 %if 0%{?fedora}
@@ -336,7 +336,7 @@ fi
 
 %post -n perl-X2Go-Server-DB
 # Initialize the session database (second attempt, may fail if x2goserver is not yet installed
-[ ! -f %{_sharedstatedir}/x2go/x2go_sessions ] &&
+[ ! -s %{_sharedstatedir}/x2go/x2go_sessions ] && egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql 1>/dev/null 2>/dev/null &&
   %{_sbindir}/x2godbadmin --createdb 1>/dev/null 2>/dev/null || :
 
 


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).