rev 14454 - kde-extras/icecream/trunk/debian

[Fathi Boudra]

Author: fabo
Date: 2009-04-20 13:24:08 +0000 (Mon, 20 Apr 2009)
New Revision: 14454

Modified:
   kde-extras/icecream/trunk/debian/changelog
   kde-extras/icecream/trunk/debian/icecc.postrm
Log:
Fix postrm script: deluser/delgroup calls should not fail.


Modified: kde-extras/icecream/trunk/debian/changelog
===================================================================
--- kde-extras/icecream/trunk/debian/changelog	2009-04-20 09:37:58 UTC (rev 14453)
+++ kde-extras/icecream/trunk/debian/changelog	2009-04-20 13:24:08 UTC (rev 14454)
@@ -1,8 +1,9 @@
 icecc (0.9.3-2) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * Fix postrm script: deluser/delgroup calls should not fail.
+    Thanks to Holger.
 
- -- Fathi Boudra <fabo at debian.org>  Thu, 09 Apr 2009 10:18:31 +0200
+ -- Fathi Boudra <fabo at debian.org>  Mon, 20 Apr 2009 15:21:49 +0200
 
 icecc (0.9.3-1) unstable; urgency=low
 

Modified: kde-extras/icecream/trunk/debian/icecc.postrm
===================================================================
--- kde-extras/icecream/trunk/debian/icecc.postrm	2009-04-20 09:37:58 UTC (rev 14453)
+++ kde-extras/icecream/trunk/debian/icecc.postrm	2009-04-20 13:24:08 UTC (rev 14454)
@@ -9,17 +9,15 @@
 
 case "$1" in
 	purge)
-		grep -q $ICECC_USER /etc/passwd && \
-		(echo Deleting $ICECC_USER user... ; \
 		if [ -x /usr/sbin/deluser ]; then
-			deluser --quiet --system $ICECC_USER
-		fi)
+			echo "Deleting $ICECC_USER user..."
+			deluser --quiet --system $ICECC_USER > /dev/null || true
+		fi
 
-		grep -q $ICECC_GROUP /etc/group && \
-		(echo Deleting $ICECC_GROUP group... ; \
-		if [ -x /usr/sbin/deluser ]; then
-			delgroup --quiet --system $ICECC_GROUP
-		fi)
+		if [ -x /usr/sbin/delgroup ]; then
+			echo "Deleting $ICECC_GROUP group..."
+			delgroup --quiet --system $ICECC_GROUP > /dev/null || true
+		fi
 
 		rm -rf /etc/icecc
 		rm -rf /var/cache/icecc