CVS: theedge/var/lib/lunar/functions build.lunar, 1.3, 1.4 depends.lunar, 1.10, 1.11 install.lunar, 1.3, 1.4 modules.lunar, 1.21, 1.22 uniqid.lunar, 1.2, 1.3

[sofar at lunar-linux.org]

Update of /var/cvs/lunar/theedge/var/lib/lunar/functions
In directory dbguin.lunar-linux.org:/tmp/cvs-serv8069/var/lib/lunar/functions

Modified Files:
	build.lunar depends.lunar install.lunar modules.lunar 
	uniqid.lunar 
Log Message:
Some minor cosmetic fixes, run_details used better, especially in lvu, fixed a hang on use_initd. Moved conflicts() to depends.lunar, changed ID so the output of the wget command gets echoed to stdout (so we possibly can send out a motd).


Index: build.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/build.lunar,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- build.lunar	14 Jul 2003 22:38:20 -0000	1.3
+++ build.lunar	17 Jul 2003 20:19:17 -0000	1.4
@@ -315,15 +315,6 @@
 }
 
 
-conflicts() {
-  if module_installed $1 ; then
-    lrm $1
-  fi
-
-  true
-} 
-
-
 push_install_queue() {
   remove_queue   $REMOVE_QUEUE    "$1"
   remove_queue   $INSTALL_QUEUE   "$1"

Index: depends.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/depends.lunar,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- depends.lunar	14 Jul 2003 22:38:20 -0000	1.10
+++ depends.lunar	17 Jul 2003 20:19:17 -0000	1.11
@@ -8,7 +8,7 @@
 # $FUNCTIONS/depends                                       #
 # includes find_depends is_depends in_depends              #
 # remove_depends add_depends run_depends                   #
-# handle_depends rework_module rework_list                 #
+# rework_module rework_list                                #
 # fix_depends satisfy_depends                              #
 #                                                          #
 # 20020710                                                 #
@@ -174,9 +174,6 @@
 }
 
 
-handle_depends()  {  true;  }
-
-
 # rework_module : check depends database for a module
 rework_module() {
                                                                                 
@@ -412,6 +409,8 @@
 # function : satisfy_depends
 # usage    : satisfy_depends (operates on $MODULE variable)
 # purpose  : re-check module deps based on DEPENDS_CONFIG and DEPENDS_STATUS
+# NOTE: this is where a missing dependency gets installed! IOW we really do
+# "satisfy" any dependencies here!
 satisfy_depends()  {
                                                                                 
   [ -n "$DEPS_ONLY" ] && return 0
@@ -454,3 +453,16 @@
   rm $TMP_FILE 2> /dev/null
                                                                                 
 }
+
+
+# conflicts... remove conflicting modules
+conflicts() {
+  if module_installed $1 ; then
+    lrm $1
+  fi
+
+  true
+} 
+
+
+

Index: install.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/install.lunar,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- install.lunar	14 Jul 2003 22:38:20 -0000	1.3
+++ install.lunar	17 Jul 2003 20:19:17 -0000	1.4
@@ -79,6 +79,7 @@
 }
 
 
+# run the CONFIGURE script
 run_configure() {
   if [ -n "$RECONFIGURE" ];  then
     verbose_msg "Reconfiguring \"$MODULE\""
@@ -382,7 +383,8 @@
     return 1
   fi
 
-  if [ "$AUTORESURRECT" == "on" ] ; then
+  # resurrect if we can, but not is -c was issued
+  if [ "$AUTORESURRECT" == "on" -a -n "$COMPILE" ] ; then
     if resurrect $MODULE ; then
       return 0
     fi

Index: modules.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/modules.lunar,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- modules.lunar	14 Jul 2003 22:38:20 -0000	1.21
+++ modules.lunar	17 Jul 2003 20:19:17 -0000	1.22
@@ -197,7 +197,7 @@
       return 1
     fi
   fi
-  if [ -x "$SCRIPT_DIRECTORY/$2" ] ; then
+  if [ -e "$SCRIPT_DIRECTORY/$2" ] ; then
     . $SCRIPT_DIRECTORY/$2
   fi    
 }

Index: uniqid.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/uniqid.lunar,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- uniqid.lunar	13 Jul 2003 20:49:54 -0000	1.2
+++ uniqid.lunar	17 Jul 2003 20:19:17 -0000	1.3
@@ -15,9 +15,10 @@
   fi
  
   verbose_msg "registering \"$UNIQID\" with server"
-  wget -O - >/dev/null "www.lunar-linux.org/cgi-bin/houston?loc=$UNIQID" &>/dev/null
-  
+  wget -q -O - "www.lunar-linux.org/cgi-bin/houston?loc=$UNIQID" 
+
 }
+
 
 create_uniq_id() {
   if [ $UNIQID >= "" ]; then