[Pkg-utopia-commits] r3836 - in /packages/unstable/hal/debian: changelog hal.postrm

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sat Mar 24 23:58:56 2012
New Revision: 3836

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3836
Log:
Test for /var/cache/hald and /var/run/hald before trying to remove them on
purge. This avoids a harmless warning message. (Closes: #638675)

Modified:
    packages/unstable/hal/debian/changelog
    packages/unstable/hal/debian/hal.postrm

Modified: packages/unstable/hal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/changelog?rev=3836&op=diff
==============================================================================
--- packages/unstable/hal/debian/changelog (original)
+++ packages/unstable/hal/debian/changelog Sat Mar 24 23:58:56 2012
@@ -3,8 +3,10 @@
   * debian/patches/65-glib-single-include.patch: Starting with glib 2.32 it is
     now mandatory to include <glib.h> instead of individual headers.
     (Closes: #665556)
-
- -- Michael Biebl <biebl at debian.org>  Sun, 25 Mar 2012 00:51:51 +0100
+  * Test for /var/cache/hald and /var/run/hald before trying to remove them on
+    purge. This avoids a harmless warning message. (Closes: #638675)
+
+ -- Michael Biebl <biebl at debian.org>  Sun, 25 Mar 2012 00:56:08 +0100
 
 hal (0.5.14-7.1) unstable; urgency=high
 

Modified: packages/unstable/hal/debian/hal.postrm
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/hal.postrm?rev=3836&op=diff
==============================================================================
--- packages/unstable/hal/debian/hal.postrm (original)
+++ packages/unstable/hal/debian/hal.postrm Sat Mar 24 23:58:56 2012
@@ -16,10 +16,13 @@
 	else
 		echo >&2 "Not removing haldaemon system account because deluser command was not found"
 	fi
+	if [ -d /var/cache/hald ]; then
+		rm -f /var/cache/hald/fdi-cache
+		rmdir /var/cache/hald || true
+	fi
 
-	rm -f /var/cache/hald/fdi-cache
-	rmdir /var/cache/hald || true
-
-	rm -f /var/run/hald/acl-list
-	rmdir /var/run/hald || true
+	if [ -d /var/run/hald ]; then
+		rm -f /var/run/hald/acl-list
+		rmdir /var/run/hald || true
+	fi
 fi