[Initscripts-ng-commits] r530 - in /trunk/src/insserv/debian: changelog update-bootsystem-insserv

[pere at users.alioth.debian.org]

Author: pere
Date: Wed Jan 16 20:47:39 2008
New Revision: 530

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=530
Log:
  * Do not warn about obsolete init.d scripts that have been removed
    (Closes: #461073).

Modified:
    trunk/src/insserv/debian/changelog
    trunk/src/insserv/debian/update-bootsystem-insserv

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=530&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Wed Jan 16 20:47:39 2008
@@ -3,6 +3,8 @@
   * Made problematic test cases for bug #460034 and #458582 fatal
     in testing and non-fatal when uploading.
   * Added override files for bastille-firewall.
+  * Do not warn about obsolete init.d scripts that have been removed
+    (Closes: #461073).
 
  -- Petter Reinholdtsen <pere at debian.org>  Sun, 13 Jan 2008 19:32:34 +0100
 

Modified: trunk/src/insserv/debian/update-bootsystem-insserv
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/update-bootsystem-insserv?rev=530&op=diff
==============================================================================
--- trunk/src/insserv/debian/update-bootsystem-insserv (original)
+++ trunk/src/insserv/debian/update-bootsystem-insserv Wed Jan 16 20:47:39 2008
@@ -144,12 +144,15 @@
     echo "info: Checking if it is safe to convert to dependency based boot."
     for package in $(dpkg -S $(find /etc/init.d -type f -perm /+x) \
                      2>/dev/null | cut -d: -f1 | sort -u); do
-        if dpkg-query -W -f='${Conffiles}' $package | \
-            grep /etc/init.d/ | grep -q obsolete; then
-            echo "error: Obsolete init.d conffile left behind by package $package:"
-            dpkg-query -W -f='${Conffiles}' $package | \
-                grep /etc/init.d/ | grep obsolete | sed 's/^/  /'
-            badstate=1
+        obsolete_initscripts=$(dpkg-query -W -f='${Conffiles}\n' $package | \
+	    grep 'obsolete$' | grep -o '/etc/init.d/[^ ]\+') || :
+        if [ "$obsolete_initscripts" ]; then
+            for initscript in $obsolete_initscripts; do
+                if [ -e "$initscript" ]; then
+                    echo "error: Obsolete conffile $initscript left behind by package $package"
+                    badstate=1
+                fi
+            done
         fi
     done