[Lunar-commits] r20237 - lunar/trunk/var/lib/lunar/functions

[Auke Kok]

Author: sofar
Date: 2006-05-27 16:34:02 +0000 (Sat, 27 May 2006)
New Revision: 20237

Modified:
   lunar/trunk/var/lib/lunar/functions/modules.lunar
Log:
Bugfix: "xenos" found this one and repro'd it in a way that it was easily found. good work.


Modified: lunar/trunk/var/lib/lunar/functions/modules.lunar
===================================================================
--- lunar/trunk/var/lib/lunar/functions/modules.lunar	2006-05-27 14:49:52 UTC (rev 20236)
+++ lunar/trunk/var/lib/lunar/functions/modules.lunar	2006-05-27 16:34:02 UTC (rev 20237)
@@ -285,7 +285,7 @@
   #
   # valid licenses currently are:
   # osi == gpl gpl2 lgpl gfdl bsd mpl cc apache artistic qpl
-  
+
   debug_msg "module_license_accepted ($@)"
 
   local L LICENSE IS_OSI
@@ -295,7 +295,7 @@
     debug_msg "assuming LICENSE=\"osi\""
     LICENSE="osi"
   fi
-  
+
   # check for osi license
   case $LICENSE in
     gpl|gpl2|lgpl|gfdl|bsd|mpl|cc|apache|artistic|qpl|osi)
@@ -310,7 +310,7 @@
   # * accept "all" will accept anything
   if [[ -n "$ACCEPTED_LICENSES" ]]; then
     for L in $ACCEPTED_LICENSES; do
-      if [[ "$L" == "osi" ]] && "$IS_OSI" == "yes" ]] || [ "$L" == "all" ] || [ "$LICENSE" == "$L" ] ; then
+      if [[ "$L" == "osi" ]] && [[ "$IS_OSI" == "yes" ]] || [ "$L" == "all" ] || [ "$LICENSE" == "$L" ] ; then
         # explicitly accepted license!
 	debug_msg "module_license_accepted: \"$LICENSE\" is explicitly accepted"
         return 0