[Lunar-commits] CVS: theedge/var/lib/lunar/functions modules.lunar, 1.42, 1.43 sources.lunar, 1.22, 1.23

[Auke Kok]

Update of /var/cvs/lunar/theedge/var/lib/lunar/functions
In directory espresso.foo-projects.org:/tmp/cvs-serv8255/var/lib/lunar/functions

Modified Files:
	modules.lunar sources.lunar 
Log Message:
Adding -w|--want $VERSION support (NO WARRANTY) that allows you to override VERSION (don't try this with more than one module ;^))


Index: modules.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/modules.lunar,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- modules.lunar	26 Jun 2004 16:41:28 -0000	1.42
+++ modules.lunar	6 Oct 2004 12:43:05 -0000	1.43
@@ -214,7 +214,15 @@
     fi
    
     SCRIPT_DIRECTORY=$MOONBASE/$SECTION/$1
-    run_module_file $1 DETAILS &> /dev/null &&
+    if [ -z "$WANT_VERSION" ] ; then
+      run_module_file $1 DETAILS &> /dev/null || return -1
+    else
+      TMP_DETAILS=$(temp_create "details.version")
+      cat $MOONBASE/$SECTION/$1/DETAILS | sed '/^[ ]*VERSION=/d' > $TMP_DETAILS
+      VERSION="$WANT_VERSION"
+      . $TMP_DETAILS &> /dev/null || return -1
+      temp_destroy $TMP_DETAILS
+    fi
     SOURCE_DIRECTORY=${SOURCE_DIRECTORY:-$BUILD_DIRECTORY/$1-$VERSION}
     mod_v_safe_edit $1 
     MODULE_CONFIG=${MODULE_CONFIG:-$DEPENDS_CONFIG/$MOD_V_SNAME}

Index: sources.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/sources.lunar,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- sources.lunar	26 Sep 2004 15:36:30 -0000	1.22
+++ sources.lunar	6 Oct 2004 12:43:05 -0000	1.23
@@ -203,6 +203,11 @@
     return 1
   fi
 
+  if [ -n "$WANT_VERSION" ] ; then
+    message "${PROBLEM_COLOR}WARNING:${DEFAULT_COLOR}${MESSAGE_COLOR} Integrity checking is disabled when using \"--want\"!${DEFAULT_COLOR}"
+    return 0
+  fi
+
   for (( C=0 ; C<=$MAX_SOURCES ; C++ )) ; do
     TEMP=SOURCE$((C))
     TEMP=${TEMP/SOURCE0/SOURCE}