CVS: theedge/var/lib/lunar/functions depends.lunar, 1.12,
1.13 download.lunar, 1.22, 1.23 install.lunar, 1.5, 1.6
sofar at lunar-linux.org
sofar at lunar-linux.org
Tue Jul 22 21:01:32 GMT 2003
Update of /var/cvs/lunar/theedge/var/lib/lunar/functions
In directory dbguin.lunar-linux.org:/tmp/cvs-serv11348/var/lib/lunar/functions
Modified Files:
depends.lunar download.lunar install.lunar
Log Message:
Fix for breaking tars, uniformizing tmpfiles a bit more too.
Index: depends.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/depends.lunar,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- depends.lunar 17 Jul 2003 22:28:28 -0000 1.12
+++ depends.lunar 22 Jul 2003 21:01:29 -0000 1.13
@@ -413,46 +413,44 @@
# NOTE: this is where a missing dependency gets installed! IOW we really do
# "satisfy" any dependencies here!
satisfy_depends() {
-
- [ -n "$DEPS_ONLY" ] && return 0
+ if [ -n "$DEPS_ONLY" ] ; then
+ return 0
+ fi
+
unset OPTS
- if [ -s $MODULE_CONFIG ]; then
- . $MODULE_CONFIG
+ if [ -s $MODULE_CONFIG ] ; then
+ . $MODULE_CONFIG
fi
-
- TMP_FILE="/tmp/satisfy_depends.`uuidgen`"
- grep "^$MODULE:" $DEPENDS_STATUS > $TMP_FILE
+
+ TMP_FILE=$(temp_create "${MODULE}.satify-depends")
+ grep "^$MODULE:" $DEPENDS_STATUS > $TMP_FILE
while read LINE; do
- DEP_MODULE=`echo $LINE | cut -d : -f2`
- DEP_STATUS=`echo $LINE | cut -d : -f3`
- DEP_ON=`echo $LINE | cut -d : -f5`
- DEP_OFF=`echo $LINE | cut -d : -f6`
-
- if [ -n "$FIX" ]
- then if DEP_STATUS="on"
- then lin $FIX $DEP_MODULE
- fi
- elif [ "$DEP_STATUS" == "off" ] ||
- module_exiled $DEP_MODULE
- then OPTS="$OPTS $DEP_OFF"
+ DEP_MODULE=$(echo $LINE | cut -d: -f2)
+ DEP_STATUS=$(echo $LINE | cut -d: -f3)
+ DEP_ON=$(echo $LINE | cut -d: -f5)
+ DEP_OFF=$(echo $LINE | cut -d: -f6)
- elif [ "$DEP_STATUS" == "on" ] &&
- ! module_installed $DEP_MODULE &&
- ! module_held $DEP_MODULE
- then
- if lin $SILENT $COMPILE $DEP_MODULE
- then OPTS="$OPTS $DEP_ON"
- else exit 1
+ if [ -n "$FIX" ] ; then
+ if DEP_STATUS="on" ; then
+ lin $FIX $DEP_MODULE
fi
- else OPTS="$OPTS $DEP_ON"
+ elif [ "$DEP_STATUS" == "off" ] || module_exiled $DEP_MODULE ; then
+ OPTS="$OPTS $DEP_OFF"
+ elif [ "$DEP_STATUS" == "on" ] && ! module_installed $DEP_MODULE && \
+ ! module_held $DEP_MODULE ; then
+ if lin $SILENT $COMPILE $DEP_MODULE ; then
+ OPTS="$OPTS $DEP_ON"
+ else
+ exit 1
+ fi
+ else
+ OPTS="$OPTS $DEP_ON"
fi
-
done < $TMP_FILE
-
- rm $TMP_FILE 2> /dev/null
-
+
+ temp_destroy $TMP_FILE
}
Index: download.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/download.lunar,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- download.lunar 20 Jul 2003 16:52:46 -0000 1.22
+++ download.lunar 22 Jul 2003 21:01:30 -0000 1.23
@@ -186,7 +186,7 @@
erase() {
- if [ -z "$PARTIAL" ]; then
+ if [ "$PARTIAL" = "off" ]; then
verbose_msg "erase: deleting \"$(guess_filename $1)\""
rm -f $(guess_filename $1)
fi
Index: install.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/install.lunar,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- install.lunar 17 Jul 2003 20:43:48 -0000 1.5
+++ install.lunar 22 Jul 2003 21:01:30 -0000 1.6
@@ -124,8 +124,8 @@
start_logging () {
- export C_LOG=$(temp_create "${MODULE}_compilelog")
- export C_FIFO=$(temp_create "${MODULE}_compilefifo")
+ export C_LOG=$(temp_create "${MODULE}.compile-log")
+ export C_FIFO=$(temp_create "${MODULE}.compile-fifo")
# just remaking this as FIFO
rm -f $C_FIFO
@@ -221,7 +221,7 @@
remove_line() {
- F_TMP=$(temp_create "remove-line")
+ F_TMP=$(temp_create "${MODULE}.remove-line")
cp $I_LOG $F_TMP
grep -v $ITEM $F_TMP > $I_LOG
temp_destroy $F_TMP
@@ -392,8 +392,7 @@
download_module $MODULE
# set the installwatchfile
- export INSTALLWATCHFILE=$(temp_create "$MODULE-installwatch")
- invoke_installwatch
+ export INSTALLWATCHFILE=$(temp_create "$MODULE.installwatch")
# lock the module for installation, check for moonbase call
linING="/var/lock/installing.$MODULE"
@@ -425,9 +424,11 @@
if ! run_pre_build ; then
LIN_ERROR="PRE_BUILD"
else
+ invoke_installwatch
if ! run_build ; then
LIN_ERROR="BUILD"
else
+ devoke_installwatch
if ! run_post_build ; then
LIN_ERROR="POST_BUILD"
fi
More information about the Lunar-commits
mailing list