[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 0.0.1.0-6-g1298863

[X2Go dev team]

The branch, build-main has been updated
       via  1298863cc62b9167f4a270cf5262d8d234fe56b0 (commit)
      from  48ca859f6e7950c9f08d20ac7c79feff70a65b2e (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                |    1 +
 debian/x2gobroker-agent.postrm  |    8 +++++---
 debian/x2gobroker-daemon.postrm |    6 ++++--
 debian/x2gobroker-wsgi.postrm   |    6 ++++--
 4 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 x2gobroker/tests/test_uccsjson.py

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index caddae8..9bcdecc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ x2gobroker (0.0.1.1-0~x2go1) UNRELEASED; urgency=low
       Apache2 by using the mod_wsgi module.
   * /debian/control:
     + Fix --root parameter in DEB_PYTHON_INSTALL_ARGS.
+  * Properly remove the X2Go Session broker log files on package purgal.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 10 Mar 2013 13:00:32 +0100
 
diff --git a/debian/x2gobroker-agent.postrm b/debian/x2gobroker-agent.postrm
index 9b74861..8835e64 100755
--- a/debian/x2gobroker-agent.postrm
+++ b/debian/x2gobroker-agent.postrm
@@ -23,17 +23,19 @@ case "$1" in
 			dpkg-statoverride --remove /usr/lib/x2go/x2gobroker-agent
 		fi
 
-		if [ ! -d /usr/share/doc/x2gobroker-daemon ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then
-
+		if [ ! -d /usr/share/doc/x2gobroker-daemon ] && [ ! -d /usr/share/doc/x2gobroker-authservice ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then
 			if dpkg-statoverride --list /var/log/x2gobroker 1>/dev/null; then
 				dpkg-statoverride --remove /var/log/x2gobroker
 			fi
+			rm -Rf /var/log/x2gobroker
+		fi
 
+		if [ ! -d /usr/share/doc/x2gobroker-daemon ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then
 			# remove user/group x2gobroker from system (if not in use by x2gobroker-daemon
 			getent passwd x2gobroker 1>/dev/null && deluser x2gobroker
 			getent group x2gobroker 1>/dev/null && delgroup x2gobroker
 			getent group x2gobroker 1>/dev/null && delgroup x2gobroker
-			rm -Rfv /var/lib/x2gobroker
+			rm -Rf /var/lib/x2gobroker
 		fi
 
 		;;
diff --git a/debian/x2gobroker-daemon.postrm b/debian/x2gobroker-daemon.postrm
index a1e2845..3eba400 100755
--- a/debian/x2gobroker-daemon.postrm
+++ b/debian/x2gobroker-daemon.postrm
@@ -19,12 +19,14 @@ set -e
 case "$1" in
 	purge)
 
-		if [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then
-
+		if [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-authservice ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then
 			if dpkg-statoverride --list /var/log/x2gobroker 1>/dev/null; then
 				dpkg-statoverride --remove /var/log/x2gobroker
 			fi
+			rm -Rf /var/log/x2gobroker
+		fi
 
+		if [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then
 			# remove user/group x2gobroker from system (only if not in use by x2gobroker-agent
 			getent passwd x2gobroker 1>/dev/null && deluser x2gobroker
 			getent group x2gobroker 1>/dev/null && delgroup x2gobroker
diff --git a/debian/x2gobroker-wsgi.postrm b/debian/x2gobroker-wsgi.postrm
index 006022f..9b2b170 100755
--- a/debian/x2gobroker-wsgi.postrm
+++ b/debian/x2gobroker-wsgi.postrm
@@ -19,12 +19,14 @@ set -e
 case "$1" in
 	purge)
 
-		if [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-daemon ]; then
-
+		if [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-authservice ] && [ ! -d /usr/share/doc/x2gobroker-daemon ]; then
 			if dpkg-statoverride --list /var/log/x2gobroker 1>/dev/null; then
 				dpkg-statoverride --remove /var/log/x2gobroker
 			fi
+			rm -Rf /var/log/x2gobroker
+		fi
 
+		if [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-daemon ]; then
 			# remove user/group x2gobroker from system (only if not in use by x2gobroker-agent
 			getent passwd x2gobroker 1>/dev/null && deluser x2gobroker
 			getent group x2gobroker 1>/dev/null && delgroup x2gobroker
diff --git a/x2gobroker/tests/test_uccsjson.py b/x2gobroker/tests/test_uccsjson.py
new file mode 100644
index 0000000..e69de29


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