[Lunar-commits] r18974 - lunar/trunk/sbin

[Auke Kok]

Author: sofar
Date: 2006-03-01 21:13:30 +0000 (Wed, 01 Mar 2006)
New Revision: 18974

Modified:
   lunar/trunk/sbin/lin
Log:
Reworked this a bit: give it some color, stderr loggin too, and readable now as well.


Modified: lunar/trunk/sbin/lin
===================================================================
--- lunar/trunk/sbin/lin	2006-03-01 21:12:34 UTC (rev 18973)
+++ lunar/trunk/sbin/lin	2006-03-01 21:13:30 UTC (rev 18974)
@@ -125,7 +125,21 @@
       # no strange stuff should happen here anymore
       for MODULE in $MODULES ; do
         if ! module_installed $MODULE || [ ! -n "$PROBE" ] || ( [ -n "$PROBE" ] && [ "$PROBE_EXPIRED" == "on" ] && module_is_expired $MODULE ) ; then
-          if ! module_held $MODULE && ! module_exiled $MODULE && module_license_accepted $MODULE ; then
+	  # 3 more conditions to stop processing this module:
+          if module_held $MODULE ; then
+	    error_message "${LRM_COLOR}Notice:${DEFAULT_COLOR}${MESSAGE_COLOR} Skipping compile and install for held module ${MODULE_COLOR}$MODULE${DEFAULT_COLOR}"
+            continue
+	  elif module_exiled $MODULE ; then
+            error_message "${LRM_COLOR}Notice:${DEFAULT_COLOR}${MESSAGE_COLOR} Skipping compile and install for exiled module ${MODULE_COLOR}$MODULE${DEFAULT_COLOR}"
+            continue
+	  elif ! module_license_accepted $MODULE ; then
+	    error_message "${LRM_COLOR}Notice:${DEFAULT_COLOR}${MESSAGE_COLOR} The license of module ${MODULE_COLOR}$MODULE${DEFAULT_COLOR}${MESSAGE_COLOR} is incompatible with the list of"
+            error_message "allowed and/or rejected licenses. Please adjust the ACCEPTED_LICENSES or"
+            error_message "REJECTED_LICENSES variables to include or not include the specific"
+            error_message "license of this module.${DEFAULT_COLOR}"
+            continue
+	  else
+            # we're good now, start installing
             linING="/var/lock/installing.$MODULE"
             verbose_msg "starting lin \"$MODULE\""
             if ! ( SINGLE_MODULE=1 main $MODULE ) ; then
@@ -138,18 +152,6 @@
                 echo "$MODULE" >> $TMP_LIN_SUCCESS
               fi
             fi
-          else
-            # split up error messages
-            if module_held $MODULE; then
-              verbose_msg "Skipping compile and install for held module \"$MODULE\""
-            elif module_exiled $MODULE; then
-              verbose_msg "Skipping compile and install for exiled module \"$MODULE\""
-            else
-              message "${MESSAGE_COLOR}The license of this module is incompatible with the list of"
-              message "allowed and/or rejected licenses. Please adjust the ACCEPTED_LICENSES or"
-              message "REJECTED_LICENSES variables to include or not include the specific"
-              message "license of this module.${DEFAULT_COLOR}"
-            fi
           fi
         fi
       done