[Debian-eeepc-commits] [SCM] Maintenance of eeepc-acpi-scripts debian package branch, master, updated. 1.1.5-27-gbe0984a

[Darren Salt]

The following commit has been merged in the master branch:
commit be0984ae17142c4d02036310c2cdc3345a544f24
Author: Darren Salt <linux at youmustbejoking.demon.co.uk>
Date:   Sat Jan 23 14:05:40 2010 +0000

    Don't fail on upgrade, removal etc. if the acpid init script is missing.
    
    (Failure detected by piuparts.)

diff --git a/debian/changelog b/debian/changelog
index 40bb051..ec68009 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 eeepc-acpi-scripts (1.1.8) UNRELEASED; urgency=low
 
+  * Don't fail on upgrade, removal etc. if the acpid init script is missing.
+
  -- Darren Salt <linux at youmustbejoking.demon.co.uk>  Sat, 23 Jan 2010 03:59:24 +0000
 
 eeepc-acpi-scripts (1.1.7) unstable; urgency=low
diff --git a/debian/postinst b/debian/postinst
index f874682..70aad5f 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -4,7 +4,12 @@ set -e
 
 case "$1" in
     configure)
-        invoke-rc.d acpid restart>/dev/null
+        invoke-rc.d --query acpid restart 2>/dev/null && ret = $? || ret=$?
+        case $ret in
+        0|104|105|106)
+            invoke-rc.d acpid restart>/dev/null
+            ;;
+        esac
         /lib/udev/eeepc-acpi-scripts
 
         # we no longer configure stop init.d symlinks
diff --git a/debian/postrm b/debian/postrm
index 7e7f615..5a45419 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -6,7 +6,12 @@ set -e
 
 case "$1" in
     upgrade|failed-upgrade|abort-install|abort-upgrade|remove|disappear)
-        invoke-rc.d acpid restart>/dev/null
+        invoke-rc.d --query acpid restart 2>/dev/null && ret = $? || ret=$?
+        case $ret in
+        0|104|105|106)
+            invoke-rc.d acpid restart>/dev/null
+            ;;
+        esac
     ;;
 
     purge)

-- 
Maintenance of eeepc-acpi-scripts debian package