[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.2.3-142-g10e9013

[X2Go dev team]

The branch, master has been updated
       via  10e9013f9e13e07b8f7ef9ea4734c600b5fab724 (commit)
      from  f127c285ba799fce05548305573b87e1c98927f3 (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 10e9013f9e13e07b8f7ef9ea4734c600b5fab724
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Dec 20 23:17:08 2013 +0100

    x2gobroker.spec: make sure x2gobroker user/group do not get remove from system on package upgrades

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

Summary of changes:
 x2gobroker.spec |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/x2gobroker.spec b/x2gobroker.spec
index f7d5b34..7b5e7d8 100644
--- a/x2gobroker.spec
+++ b/x2gobroker.spec
@@ -283,10 +283,10 @@ if ! /usr/bin/getent group x2gobroker 1>/dev/null 2>/dev/null && /usr/sbin/group
 fi;
 
 %preun -n python-x2gobroker
-if /usr/bin/getent passwd x2gobroker >/dev/null 2>/dev/null && ! [ -f %_libexecdir/x2go/x2gobroker-agent ]; then
+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 %_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;
 
@@ -352,10 +352,10 @@ if ! /usr/bin/getent group x2gobroker 1>/dev/null 2>/dev/null && /usr/sbin/group
 fi;
 
 %preun agent
-if /usr/bin/getent passwd x2gobroker >/dev/null 2>/dev/null && ! type x2gobroker; then
+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 && ! type x2gobroker; 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).