[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] Fix cleanup code in debian/debian-edu-config.postrm (Closes: #904516).

[WolfgangSchweer]

WolfgangSchweer pushed to branch master at Debian Edu / debian-edu-config


Commits:
04e1d97f by Wolfgang Schweer at 2018-07-25T10:37:14+02:00
Fix cleanup code in debian/debian-edu-config.postrm (Closes: #904516).

Move cfengine3 related cleanup code from remove to purge case.
Thanks to Andreas Beckmann.

- - - - -


2 changed files:

- debian/changelog
- debian/debian-edu-config.postrm


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debian-edu-config (2.10.32) UNRELEASED; urgency=medium
+
+  * debian/debian-edu-config.postrm:
+    - Move cfengine3 related cleanup code from remove to purge case.
+      Thanks to Andreas Beckmann. (Closes: #904516).
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Wed, 25 Jul 2018 10:28:23 +0200
+
 debian-edu-config (2.10.31) unstable; urgency=medium
 
   [ Wolfgang Schweer ]


=====================================
debian/debian-edu-config.postrm
=====================================
--- a/debian/debian-edu-config.postrm
+++ b/debian/debian-edu-config.postrm
@@ -18,16 +18,6 @@ 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
@@ -41,6 +31,16 @@ case "$1" in
 	    rm /var/log/cfengine3/*.log
 	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
+
         # Don't leave copied ldapscripts files behind
 	if [ -e /etc/ldapscripts/debian-edu.addmachine.template ] ; then
 	    rm /etc/ldapscripts/debian-edu.*



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/commit/04e1d97f166fbd148d813259d0e132aed755f38d

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/commit/04e1d97f166fbd148d813259d0e132aed755f38d
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20180725/7b8e3227/attachment-0001.html>