[Logcheck-commits] r1259 - logcheck/trunk/debian

[madduck at users.alioth.debian.org]

Author: madduck
Date: 2006-10-18 21:22:17 +0000 (Wed, 18 Oct 2006)
New Revision: 1259

Modified:
   logcheck/trunk/debian/changelog
   logcheck/trunk/debian/logcheck.postinst
   logcheck/trunk/debian/logcheck.postrm
Log:
* Safer adding of logcheck alias to /etc/aliases; now does *not* remove the
  alias on remove/purge anymore since mail may still arrive at a later point
  (closes: #392637).

Modified: logcheck/trunk/debian/changelog
===================================================================
--- logcheck/trunk/debian/changelog	2006-10-18 21:14:13 UTC (rev 1258)
+++ logcheck/trunk/debian/changelog	2006-10-18 21:22:17 UTC (rev 1259)
@@ -2,8 +2,11 @@
 
   * violations.d/smartd: elevate messages about uncorrectable and unreadable
     sectors (closes: #392679).
+  * Safer adding of logcheck alias to /etc/aliases; now does *not* remove the
+    alias on remove/purge anymore since mail may still arrive at a later point
+    (closes: #392637).
 
- -- martin f. krafft <madduck at debian.org>  Wed, 18 Oct 2006 23:12:22 +0200
+ -- martin f. krafft <madduck at debian.org>  Wed, 18 Oct 2006 23:21:30 +0200
 
 logcheck (1.2.49~unreleased.1) UNRELEASED; urgency=low
 

Modified: logcheck/trunk/debian/logcheck.postinst
===================================================================
--- logcheck/trunk/debian/logcheck.postinst	2006-10-18 21:14:13 UTC (rev 1258)
+++ logcheck/trunk/debian/logcheck.postinst	2006-10-18 21:22:17 UTC (rev 1259)
@@ -40,13 +40,10 @@
 
 	# add logcheck to /etc/aliases
 	if [ -f /etc/aliases ] || [ -L /etc/aliases ]; then
-	    if ! grep -qi "^logcheck" /etc/aliases; then
-		echo "logcheck: root" >> /etc/aliases
-		newaliases=`which newaliases`
-		if [ $newaliases ] && [ -x $newaliases ]; then
-		    newaliases || true
-		fi
-	    fi
+    if ! grep -qi "^logcheck[[:space:]]*:" /etc/aliases; then
+      echo "logcheck: root" >> /etc/aliases
+      test -x "$(command -v newaliases)" && newaliases || :
+    fi
 	fi
 
 	# Remove unused old directory on upgrade

Modified: logcheck/trunk/debian/logcheck.postrm
===================================================================
--- logcheck/trunk/debian/logcheck.postrm	2006-10-18 21:14:13 UTC (rev 1258)
+++ logcheck/trunk/debian/logcheck.postrm	2006-10-18 21:22:17 UTC (rev 1259)
@@ -32,18 +32,8 @@
 	;;
 
     remove)
-	# remove logcheck from /etc/aliases
-	if [ -f /etc/aliases ] || [ -L /etc/aliases ]; then
-	    if grep -qi "^logcheck" /etc/aliases; then
-	    	grep -v "^logcheck" /etc/aliases > /etc/aliases.new
-		mv /etc/aliases.new /etc/aliases
-		newaliases=`which newaliases`
-		if [ $newaliases ] && [ -x $newaliases ]; then
-		    newaliases || true
-		fi
-	    fi
-	fi													    
-    	;;
+    :
+    ;;
 
     upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)