[Glibc-bsd-commits] r2722 - trunk/kfreebsd-7/debian

[Aurelien Jarno]

Author: aurel32
Date: 2009-08-20 20:08:46 +0000 (Thu, 20 Aug 2009)
New Revision: 2722

Modified:
   trunk/kfreebsd-7/debian/kfreebsd-image.postinst.in
   trunk/kfreebsd-7/debian/kfreebsd-image.postrm.in
   trunk/kfreebsd-7/debian/kfreebsd-image.preinst.in
   trunk/kfreebsd-7/debian/kfreebsd-image.prerm.in
Log:
Fix maintainer script invocation


Modified: trunk/kfreebsd-7/debian/kfreebsd-image.postinst.in
===================================================================
--- trunk/kfreebsd-7/debian/kfreebsd-image.postinst.in	2009-08-20 19:14:43 UTC (rev 2721)
+++ trunk/kfreebsd-7/debian/kfreebsd-image.postinst.in	2009-08-20 20:08:46 UTC (rev 2722)
@@ -54,7 +54,7 @@
         fi
     
         # Run postinst hook if defined
-        postinst_hook=$(sed '/^\s*postinst_hook/!d;s/.*=//g' $KERNEL_IMG_CONF 2>/dev/null)
+        postinst_hook=$(sed '/^\s*postinst_hook/!d;s/.*=//g' $KERNEL_IMG_CONF 2>/dev/null || true)
         if [ -n "$postinst_hook" ] ; then
             echo "Running postinst hook script $script." 1>&2 
             $postinst_hook "$VERSION" "/boot/kfreebsd-$RELEASE.gz"

Modified: trunk/kfreebsd-7/debian/kfreebsd-image.postrm.in
===================================================================
--- trunk/kfreebsd-7/debian/kfreebsd-image.postrm.in	2009-08-20 19:14:43 UTC (rev 2721)
+++ trunk/kfreebsd-7/debian/kfreebsd-image.postrm.in	2009-08-20 20:08:46 UTC (rev 2722)
@@ -24,14 +24,17 @@
 VERSION="@VERSION@"
 
 case "$1" in
-    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    remove)
         # Run postrm hook if defined
-        postrm_hook=$(sed '/^\s*postrm_hook/!d;s/.*=//g' $KERNEL_IMG_CONF 2>/dev/null)
+        postrm_hook=$(sed '/^\s*postrm_hook/!d;s/.*=//g' $KERNEL_IMG_CONF 2>/dev/null || true)
         if [ -n "$postrm_hook" ] ; then
             echo "Running postrm hook script $script." 1>&2 
             $postrm_hook "$VERSION" "/boot/kfreebsd-$RELEASE.gz"
         fi
     ;;
+    
+    purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
 
     *)
         echo "postrm called with unknown argument \`$1'" >&2

Modified: trunk/kfreebsd-7/debian/kfreebsd-image.preinst.in
===================================================================
--- trunk/kfreebsd-7/debian/kfreebsd-image.preinst.in	2009-08-20 19:14:43 UTC (rev 2721)
+++ trunk/kfreebsd-7/debian/kfreebsd-image.preinst.in	2009-08-20 20:08:46 UTC (rev 2722)
@@ -21,7 +21,7 @@
 case "$1" in
     install|upgrade)
         # Run preinst hook if defined
-        preinst_hook=$(sed '/^\s*preinst_hook/!d;s/.*=//g' $KERNEL_IMG_CONF 2>/dev/null)
+        preinst_hook=$(sed '/^\s*preinst_hook/!d;s/.*=//g' $KERNEL_IMG_CONF 2>/dev/null || true)
         if [ -n "$preinst_hook" ] ; then
             echo "Running preinst hook script $script." 1>&2 
             $preinst_hook "$VERSION" "/boot/kfreebsd-$RELEASE.gz"

Modified: trunk/kfreebsd-7/debian/kfreebsd-image.prerm.in
===================================================================
--- trunk/kfreebsd-7/debian/kfreebsd-image.prerm.in	2009-08-20 19:14:43 UTC (rev 2721)
+++ trunk/kfreebsd-7/debian/kfreebsd-image.prerm.in	2009-08-20 20:08:46 UTC (rev 2722)
@@ -22,16 +22,16 @@
 VERSION="@VERSION@"
 
 case "$1" in
-    remove|upgrade|deconfigure)
+    remove)
         # Run prerm hook if defined
-        prerm_hook=$(sed '/^\s*prerm_hook/!d;s/.*=//g' $KERNEL_IMG_CONF 2>/dev/null)
+        prerm_hook=$(sed '/^\s*prerm_hook/!d;s/.*=//g' $KERNEL_IMG_CONF 2>/dev/null || true)
         if [ -n "$prerm_hook" ] ; then
             echo "Running prerm hook script $script." 1>&2 
             $prerm_hook "$VERSION" "/boot/kfreebsd-$RELEASE.gz"
         fi
     ;;
 
-    failed-upgrade)
+    failed-upgrade|upgrade|deconfigure)
     ;;
 
     *)