This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 7d7935e Don't fail in %post during X2Go session DB creation. new 447842e x2goserver.spec: More scriptlet fixes. The 1 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: x2goserver.spec | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 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 447842edd5c17726284995655ca6c24d2b637d37 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Oct 13 16:50:39 2014 +0200 x2goserver.spec: More scriptlet fixes. --- x2goserver.spec | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index 55b4186..2a84916 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -350,12 +350,16 @@ 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 && +[ ! -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 || : -egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql 1>/dev/null 2>/dev/null && { [ ! -s %{_sharedstatedir}/x2go/x2go_sessions ] && %{_sbindir}/x2godbadmin --createdb 1>/dev/null 2>/dev/null || %{_sbindir}/x2godbadmin --updatedb 1>/dev/null 2>/dev/null; } +egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql 1>/dev/null 2>/dev/null && { \ + [ ! -s %{_sharedstatedir}/x2go/x2go_sessions ] && \ + %{_sbindir}/x2godbadmin --createdb 1>/dev/null 2>/dev/null || \ + %{_sbindir}/x2godbadmin --updatedb 1>/dev/null 2>/dev/null; \ +} %if 0%{?fedora} || 0%{?rhel} >= 7 %systemd_post x2goserver.service @@ -384,10 +388,10 @@ 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 || +[ ! -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 || : %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