[debian-edu-commits] debian-edu/ 01/04: Adjust cfengine3 related code in debian/debian-edu-config.postrm:

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository debian-edu-config.

commit 5ee30d647ebd3eb9bbd1890c16fef8fd9f47b91c
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Mon Jan 22 20:04:14 2018 +0100

    Adjust cfengine3 related code in debian/debian-edu-config.postrm:
    
     Add additional condition for the generated file.
     Move code block from purge) to remove) to avoid an order related conflict.
---
 debian/debian-edu-config.postrm | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/debian/debian-edu-config.postrm b/debian/debian-edu-config.postrm
index c85ecf6..cd099d7 100644
--- a/debian/debian-edu-config.postrm
+++ b/debian/debian-edu-config.postrm
@@ -18,6 +18,16 @@ case "$1" in
 	    dpkg-divert --package debian-edu-config --rename --remove /usr/bin/gtick
 	    rm /usr/bin/gtick.ltsp
 	fi
+
+        # Cfengine3 setup files copied / generated at installation time
+        # via '/usr/share/debian-edu-config/tools/setup-cfengine3'
+	if [ -e /var/lib/cfengine3/inputs/debian-edu ] ; then
+	    rm -rf /var/lib/cfengine3/inputs/debian-edu
+	    rm -rf /var/lib/cfengine3/inputs/
+	fi
+	if [ -e /var/lib/cfengine3/policy_server.dat ] ; then
+	    rm /var/lib/cfengine3/policy_server.dat
+	fi
 	;;
     purge)
 	# Generated in the postinst
@@ -28,14 +38,6 @@ case "$1" in
 	    rm -f /var/lib/dovecot/auth_success
 	fi
 
-        # Cfengine3 setup files copied / generated at installation time
-        # via '/usr/share/debian-edu-config/tools/setup-cfengine3'
-	if [ -e /var/lib/cfengine3/inputs/debian-edu ] ; then
-	    rm -rf /var/lib/cfengine3/inputs/debian-edu
-	    rm -rf /var/lib/cfengine3/inputs/
-	    rm /var/lib/cfengine3/policy_server.dat
-	fi
-
         # Don't leave Cfengine3 log files behind
 	if [ -e /var/log/cfengine3/promise_summary.log ] ; then
 	    rm /var/log/cfengine3/*.log

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git