[Pkg-sysvinit-commits] r1604 - sysvinit/trunk/debian

[Petter Reinholdtsen]

Author: pere
Date: 2009-08-03 22:15:11 +0000 (Mon, 03 Aug 2009)
New Revision: 1604

Modified:
   sysvinit/trunk/debian/sysv-rc.postinst
Log:
Clean up divert handling.

Modified: sysvinit/trunk/debian/sysv-rc.postinst
===================================================================
--- sysvinit/trunk/debian/sysv-rc.postinst	2009-08-03 21:58:13 UTC (rev 1603)
+++ sysvinit/trunk/debian/sysv-rc.postinst	2009-08-03 22:15:11 UTC (rev 1604)
@@ -18,25 +18,12 @@
     div=$(dpkg-divert --list $2)
     distrib=${4:-$2.distrib}
     case "$1" in
-    true)
-        if [ -z "$div" ]; then
-	    dpkg-divert --package $package --divert $distrib --add $2
-	    cp -dp $2 $distrib
-	    ln -sf $3 $2
-	fi
-	;;
     false)
         if [ -n "$div" ] && [ -z "${div%%*by $package}" ]; then
 	    mv $distrib $2
-	    dpkg-divert --remove $2
+	    dpkg-divert --package $package --remove $2
 	fi
 	;;
-    status) # Return true if the divert is in effect
-        if [ -n "$div" ] && [ -z "${div%%*by $package}" ]; then
-	    :
-	else
-	    false
-	fi
     esac
 }
 
@@ -116,8 +103,7 @@
 
 # Remove divert if it exist.  It was dropped in insserv 1.12.0-11 and
 # sysvinit 2.87dsf-3, 2009-07-29.
-check_divert false /usr/sbin/update-rc.d \
-    /usr/sbin/update-rc.d-insserv
+check_divert false /usr/sbin/update-rc.d /usr/sbin/update-rc.d-insserv
 
 case "$1" in
     configure)