[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.2.3-143-g759ccf0
X2Go dev team
git-admin at x2go.org
Fri Dec 20 23:30:35 CET 2013
The branch, master has been updated
via 759ccf0b1e43ce9e8cb3eda13fad5e6601abc40a (commit)
from 10e9013f9e13e07b8f7ef9ea4734c600b5fab724 (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 759ccf0b1e43ce9e8cb3eda13fad5e6601abc40a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Dec 20 23:30:30 2013 +0100
x2gobroker.spec: another attempt of fixing removal / non-removal of the x2gobroker user/group
-----------------------------------------------------------------------
Summary of changes:
x2gobroker.spec | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
The diff of changes is:
diff --git a/x2gobroker.spec b/x2gobroker.spec
index 7b5e7d8..f76541c 100644
--- a/x2gobroker.spec
+++ b/x2gobroker.spec
@@ -282,11 +282,11 @@ if ! /usr/bin/getent group x2gobroker 1>/dev/null 2>/dev/null && /usr/sbin/group
-g x2gobroker -r -s /bin/bash x2gobroker || :;
fi;
-%preun -n python-x2gobroker
-if /usr/bin/getent passwd x2gobroker >/dev/null 2>/dev/null && ! [ -f /dev/default/python-x2gobroker ] && ! [ -f %_libexecdir/x2go/x2gobroker-agent ]; then
+%postun -n python-x2gobroker
+if /usr/bin/getent passwd x2gobroker >/dev/null 2>/dev/null && [ ! -f /dev/default/python-x2gobroker ] && [ ! -f %_libexecdir/x2go/x2gobroker-agent ]; then
/usr/sbin/userdel x2gobroker;
fi;
-if /usr/bin/getent group x2gobroker >/dev/null 2>/dev/null && ! [ -f /dev/default/python-x2gobroker ] && ! [ -f %_libexecdir/x2go/x2gobroker-agent ]; then
+if /usr/bin/getent group x2gobroker >/dev/null 2>/dev/null && [ ! -f /dev/default/python-x2gobroker ] && [ ! -f %_libexecdir/x2go/x2gobroker-agent ]; then
/usr/sbin/groupdel x2gobroker;
fi;
@@ -351,11 +351,11 @@ if ! /usr/bin/getent group x2gobroker 1>/dev/null 2>/dev/null && /usr/sbin/group
-g x2gobroker -r -s /bin/bash x2gobroker || :;
fi;
-%preun agent
-if /usr/bin/getent passwd x2gobroker >/dev/null 2>/dev/null && ! [ -f /dev/default/python-x2gobroker ] && ! [ -f %_libexecdir/x2go/x2gobroker-agent ]; then
+%postun agent
+if /usr/bin/getent passwd x2gobroker >/dev/null 2>/dev/null && [ ! -f /dev/default/python-x2gobroker ] && [ ! -f %_libexecdir/x2go/x2gobroker-agent ]; then
/usr/sbin/userdel x2gobroker;
fi;
-if /usr/bin/getent group x2gobroker >/dev/null 2>/dev/null && ! [ -f /dev/default/python-x2gobroker ] && ! [ -f %_libexecdir/x2go/x2gobroker-agent ]; then
+if /usr/bin/getent group x2gobroker >/dev/null 2>/dev/null && [ ! -f /dev/default/python-x2gobroker ] && [ ! -f %_libexecdir/x2go/x2gobroker-agent ]; then
/usr/sbin/groupdel x2gobroker;
fi;
hooks/post-receive
--
x2gobroker.git (HTTP(S) Session broker for X2Go)
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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).
More information about the x2go-commits
mailing list