CVS: theedge/var/lib/lunar/functions build.lunar, 1.11, 1.12 depends.lunar, 1.17, 1.18 download.lunar, 1.34, 1.35 install.lunar, 1.20, 1.21 modules.lunar, 1.27, 1.28 sources.lunar, 1.15, 1.16

[sofar at lunar-linux.org]

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

Modified Files:
	build.lunar depends.lunar download.lunar install.lunar 
	modules.lunar sources.lunar 
Log Message:
Same bugfixes as in lunar core.


Index: build.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/build.lunar,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- build.lunar	14 Aug 2003 21:27:53 -0000	1.11
+++ build.lunar	4 Oct 2003 20:19:43 -0000	1.12
@@ -143,12 +143,18 @@
   verbose_msg "creating building dir \"$NEW_DIR\""
 
   if [ "$TMPFS" != "off" ]; then 
-    umount  $NEW_DIR  2>/dev/null
-    rmdir   $NEW_DIR  2>/dev/null
+    if [ -d $NEW_DIR ] ; then
+      verbose_msg "Removing old source directory first!"
+      umount  $NEW_DIR  2>/dev/null
+      rmdir   $NEW_DIR  2>/dev/null
+    fi
     mkdir  -p  $NEW_DIR  &&
     mount  -o  size=1g,nr_inodes=1m  -t  tmpfs  tmpfs  $NEW_DIR
   else
-    rm -rf  $NEW_DIR  2>/dev/null
+    if [ -d $NEW_DIR ] ; then
+      verbose_msg "Removing old source directory first!"
+      rm -rf  $NEW_DIR  2>/dev/null
+    fi
     mkdir  -p  $NEW_DIR
   fi
 

Index: depends.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/depends.lunar,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- depends.lunar	7 Aug 2003 09:48:31 -0000	1.17
+++ depends.lunar	4 Oct 2003 20:19:43 -0000	1.18
@@ -8,8 +8,7 @@
 # $FUNCTIONS/depends                                       #
 # includes find_depends is_depends in_depends              #
 # remove_depends add_depends run_depends                   #
-# rework_module rework_list                                #
-# fix_depends satisfy_depends                              #
+# satisfy_depends                                          #
 #                                                          #
 # 20020710                                                 #
 #                                                          #

Index: download.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/download.lunar,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- download.lunar	31 Aug 2003 18:51:09 -0000	1.34
+++ download.lunar	4 Oct 2003 20:19:43 -0000	1.35
@@ -237,7 +237,7 @@
 
   WGET_NUM_RETRY=${NUM_RETRY:=5}
   WGET_RETRIES="--tries=${WGET_NUM_RETRY}"
-  FUZZY=${FUZZY:=on}
+  FUZZY=${FUZZY:=off}
 
   S_FILE=$(basename $2 | sed -e "s/\.tar\.gz$//" -e "s/\.tgz$//" -e  "s/\.tar\.bz2$//")
 

Index: install.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/install.lunar,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- install.lunar	1 Oct 2003 16:28:46 -0000	1.20
+++ install.lunar	4 Oct 2003 20:19:43 -0000	1.21
@@ -499,10 +499,15 @@
 build_module_depends() {
 (
   debug_msg "build_module_depends ($@)"
-  run_details $1 &&
-  run_configure &&
-  run_depends &&
-  satisfy_depends
+  if [ -n "$DEPS_ONLY" ] ; then
+    run_details $1 &&
+    run_depends
+  else
+    run_details $1 &&
+    run_configure &&
+    run_depends &&
+    satisfy_depends
+  fi
 )
 }
 

Index: modules.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/modules.lunar,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- modules.lunar	1 Oct 2003 16:28:46 -0000	1.27
+++ modules.lunar	4 Oct 2003 20:19:43 -0000	1.28
@@ -306,8 +306,12 @@
     lock_file $MODULE_STATUS_BACKUP
     lock_file $MODULE_STATUS
     for MODULE in "$@" ; do
-      grep -v "^$MODULE:" $MODULE_STATUS > $MODULE_STATUS_BACKUP
-      grep "^$MODULE:" $MODULE_STATUS | sed "s:installed:exiled:" >> $MODULE_STATUS_BACKUP
+      if $(module_installed $MODULE) ; then
+        grep -v "^$MODULE:" $MODULE_STATUS > $MODULE_STATUS_BACKUP
+        grep "^$MODULE:" $MODULE_STATUS | sed "s:installed:exiled:" >> $MODULE_STATUS_BACKUP
+      else
+        echo "$MODULE::exiled:0.0" >> $MODULE_STATUS_BACKUP
+      fi
       cp $MODULE_STATUS_BACKUP $MODULE_STATUS
     done
     unlock_file $MODULE_STATUS

Index: sources.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/sources.lunar,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- sources.lunar	4 Aug 2003 23:19:42 -0000	1.15
+++ sources.lunar	4 Oct 2003 20:19:43 -0000	1.16
@@ -202,7 +202,7 @@
 	    RESULT=1
 	  fi
 	elif [ "${VFY:0:4}" == "gpg:" ] ; then
-	  if ! gpg_verify_source $SRC1 $(echo $VFY | cut -d: -f2-3) $(echo $VFY | cut -d: -f4-5) ; then
+	  if ! gpg_verify_source $SRC1 $(echo $VFY | cut -d: -f2- | cut -f1) $(echo $VFY | cut d: -f2- | cut -f2) $(echo $VFY | cut -d: -f2- | cut -f3) ; then
 	    message "${PROBLEM_COLOR}!gpg signature check failed for ${DEFAULT_COLOR}${FILE_COLOR}$SRC1${DEFAULT_COLOR}"
 	    RESULT=1
 	  fi