[Dbconfig-common-changes] [dbconfig-common] r454 - trunk/debian

[Sean Finney]

tags 476949 pending
thanks

Author: seanius
Date: 2008-04-20 21:46:29 +0000 (Sun, 20 Apr 2008)
New Revision: 454

Modified:
   trunk/debian/changelog
   trunk/debian/dbconfig-common.postrm
Log:
purge fix

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-04-11 18:17:11 UTC (rev 453)
+++ trunk/debian/changelog	2008-04-20 21:46:29 UTC (rev 454)
@@ -1,7 +1,9 @@
-dbconfig-common (1.8.38+nmu1) UNRELEASED; urgency=low
+dbconfig-common (1.8.39) UNRELEASED; urgency=high
 
-  * Non-maintainer upload.
   * NOT RELEASED YET
+  * fix for package failing to purge, thanks to Michael Tautschnig for
+    reporting this (closes: #476949).
+  * rc bugfix, high urgency upload.
 
  -- sean finney <seanius at debian.org>  Fri, 11 Apr 2008 20:17:41 +0200
 

Modified: trunk/debian/dbconfig-common.postrm
===================================================================
--- trunk/debian/dbconfig-common.postrm	2008-04-11 18:17:11 UTC (rev 453)
+++ trunk/debian/dbconfig-common.postrm	2008-04-20 21:46:29 UTC (rev 454)
@@ -4,12 +4,13 @@
 
 if [ $1 = "purge" ]; then
 	rm -f /etc/dbconfig-common/config || true
-	rmdir /etc/dbconfig-common || true
-	# purge the default logfile/logdir
+	# purge the various default logfile/logdir locations
 	rm -f /var/log/dbconfig-common/dbc.log
-	rmdir --ignore-fail-on-non-empty /var/log/dbconfig-common
-	# This might fail if a user has chosen not to purge a database
-	rmdir --ignore-fail-on-non-empty /var/lib/dbconfig-common || true
+  for d in /etc /var/log /var/lib; do
+    if [ -d "$d/dbconfig-common" ]; then
+	    rmdir --ignore-fail-on-non-empty "$d/dbconfig-common" 
+    fi
+  done
 fi
 
 #DEBHELPER#