[Pkg-erlang-commits] r1130 - couchdb/trunk/debian

[sbisbee-guest at alioth.debian.org]

Author: sbisbee-guest
Date: 2009-11-12 06:02:07 +0000 (Thu, 12 Nov 2009)
New Revision: 1130

Modified:
   couchdb/trunk/debian/changelog
   couchdb/trunk/debian/postrm
Log:
Fixing postrm purge issues and removing version cases.

Modified: couchdb/trunk/debian/changelog
===================================================================
--- couchdb/trunk/debian/changelog	2009-11-12 04:35:58 UTC (rev 1129)
+++ couchdb/trunk/debian/changelog	2009-11-12 06:02:07 UTC (rev 1130)
@@ -31,8 +31,11 @@
     libreadline-dev. (Closes: #553742)
   * Updated debian/README.Debian, removed log directory partitioning info
     per Sergei's related changes to put all logs in one directory.
+  * Updated debian/postrm, rmdir didn't like that its target directories
+    weren't non-empty (despite passed args), causing errors and failing to
+    remove directories. Also removed the version partitioning cases.
 
- -- Sam Bisbee <sbisbee at computervip.com>  Wed, 11 Nov 2009 23:33:21 -0500
+ -- Sam Bisbee <sbisbee at computervip.com>  Thu, 12 Nov 2009 00:55:05 -0500
 
 couchdb (0.9.0-2) unstable; urgency=low
 

Modified: couchdb/trunk/debian/postrm
===================================================================
--- couchdb/trunk/debian/postrm	2009-11-12 04:35:58 UTC (rev 1129)
+++ couchdb/trunk/debian/postrm	2009-11-12 06:02:07 UTC (rev 1130)
@@ -11,22 +11,16 @@
 case $1 in
     purge)
         if test -d "/etc/couchdb"; then
-            rmdir --ignore-fail-on-non-empty "/etc/couchdb" || true
+            rm -r -f "/etc/couchdb" 
         fi
-        if test -d "/var/lib/couchdb/$VERSION"; then
-            rmdir --ignore-fail-on-non-empty "/var/lib/couchdb/$VERSION" || true
-        fi
         if test -d "/var/lib/couchdb"; then
-            rmdir --ignore-fail-on-non-empty "/var/lib/couchdb" || true
+            rm -r -f "/var/lib/couchdb" 
         fi
-        if test -d "/var/log/couchdb/$VERSION"; then
-            rmdir --ignore-fail-on-non-empty "/var/log/couchdb/$VERSION" || true
-        fi
         if test -d "/var/log/couchdb"; then
-            rmdir --ignore-fail-on-non-empty "/var/log/couchdb" || true
+            rm -r -f "/var/log/couchdb" 
         fi
         if test -d "/var/run/couchdb"; then
-            rmdir --ignore-fail-on-non-empty "/var/run/couchdb" || true
+            rm -r -f "/var/run/couchdb" 
         fi
         if getent passwd couchdb > /dev/null && which deluser > /dev/null; then
             deluser couchdb