[pkg-bacula-commits] [bacula] 01/01: Don't delete all of /etc/bacula when purging bacula-common

[Carsten Leonhardt]

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

leo pushed a commit to branch migrate-files
in repository bacula.

commit dd38309ee1e3218c04b97d1519f347e1065c8f10
Author: Carsten Leonhardt <leo at debian.org>
Date:   Tue Aug 30 08:53:24 2016 +0200

    Don't delete all of /etc/bacula when purging bacula-common
---
 debian/TODO                 | 8 --------
 debian/bacula-common.postrm | 2 +-
 debian/changelog            | 6 ++++++
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/debian/TODO b/debian/TODO
index 6ef2865..df85939 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -8,14 +8,6 @@ High:
    - check that all conffiles are correctly owned by its package
    - maybe refer to old development git tag
      development/migrate-to-ucf-2012-06-07
- * Find a better solution to "rm -fr /etc/bacula" during purge of
-   bacula-common:
-     The problem: some bacula packages with conffiles are removed but
-     not purged. If bacula-common is then purged, it deletes all the
-     config files, even those owned by other, still unpurged
-     packages. ucf will think the user deleted the config files, which
-     leads to the situation that if bacula is now reinstalled, ucf
-     will not reinstall the conffiles that it thinks the user deleted.
 
 Normal:
 
diff --git a/debian/bacula-common.postrm b/debian/bacula-common.postrm
index ee6341f..bebf9ee 100644
--- a/debian/bacula-common.postrm
+++ b/debian/bacula-common.postrm
@@ -6,7 +6,7 @@ set -e
 case "$1" in
 	purge)
 		rm -rf /run/bacula
-		rm -rf /etc/bacula
+		rmdir /etc/bacula > /dev/null || echo "Warning: /etc/bacula not empty, not removing" >&2
 		rm -rf /var/log/bacula
 		rm -rf /var/lib/bacula
 	;;
diff --git a/debian/changelog b/debian/changelog
index 900ab79..5a62155 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bacula (7.4.3+dfsg-5) unstable; urgency=medium
+
+  * Don't delete all of /etc/bacula when purging bacula-common
+
+ --
+
 bacula (7.4.3+dfsg-4) experimental; urgency=medium
 
   * Fix init scripts to make sure the daemons can be stopped before

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