[kernel] r12463 - dists/trunk/firmware-nonfree/debian/templates

[Bastian Blank]

Author: waldi
Date: Fri Nov 28 12:25:42 2008
New Revision: 12463

Log:
debian/templates/preinst.license.in: Fix control flow.


Modified:
   dists/trunk/firmware-nonfree/debian/templates/preinst.license.in

Modified: dists/trunk/firmware-nonfree/debian/templates/preinst.license.in
==============================================================================
--- dists/trunk/firmware-nonfree/debian/templates/preinst.license.in	(original)
+++ dists/trunk/firmware-nonfree/debian/templates/preinst.license.in	Fri Nov 28 12:25:42 2008
@@ -15,8 +15,8 @@
     echo >&2 ''
 }
 
-db_get firmware- at package@/license/accepted
-if [ "$RET" != "true" ]; then
+ask()
+{
     # facilitate backup capability per debconf-devel(7)
     STATE=1
     while true; do
@@ -29,32 +29,32 @@
             db_get firmware- at package@/license/accepted
             if [ "$RET" != true -o "${license_accept}" = "no-preseed" ]; then
                 db_fset firmware- at package@/license/present seen false
-		if ! db_input critical firmware- at package@/license/present ; then
-		    errmsg "firmware- at package@ license could not be presented"
+                if ! db_input critical firmware- at package@/license/present ; then
+                    errmsg "firmware- at package@ license could not be presented"
                     exit 2
                 fi
 
                 db_fset firmware- at package@/license/accepted seen false
                 if ! db_input critical firmware- at package@/license/accepted ; then
-		    errmsg "firmware- at package@ agree question could not be asked"
+                    errmsg "firmware- at package@ agree question could not be asked"
                     exit 2
                 fi
             fi
             ;;      
         2)  # determine users' choice
             db_get firmware- at package@/license/accepted
-            if [ "$RET" != "true" ]; then
-                # error on decline license (give user chance to back up)
-                db_input critical firmware- at package@/license/error
-                exit 1
+            if [ "$RET" = "true" ]; then
+                exit 0
             fi
+            # error on decline license (give user chance to back up)
+            db_input critical firmware- at package@/license/error
             ;;      
-        3)  # user has confirmed declining license
-	    echo "user did not accept the firmware- at package@ license" >&2
+        3)
+            echo "user did not accept the firmware- at package@ license" >&2
             exit 1
-            ;;   
+            ;;
         *)  # unknown state
-	    echo "firmware- at package@ license state unknown: $STATE" >&2
+            echo "firmware- at package@ license state unknown: $STATE" >&2
             exit 2
             ;;   
         esac
@@ -64,6 +64,13 @@
             STATE=$(($STATE - 1))
         fi
     done
+}
+
+db_get firmware- at package@/license/accepted
+if [ "$RET" != "true" ]; then
+    ask
+    RESULT=$?
+    [ "$RESULT" = 0 ] || exit $RESULT
 fi
  
 #DEBHELPER#