CVS: theedge/var/lib/lunar/functions check.lunar, 1.8,
1.9 edit.lunar, 1.9, 1.10 install.lunar, 1.19,
1.20 modules.lunar, 1.26, 1.27 sizes.lunar, 1.6,
1.7 temp.lunar, 1.5, 1.6 tracking.lunar, 1.9, 1.10
elaine at lunar-linux.org
elaine at lunar-linux.org
Wed Oct 1 16:28:48 GMT 2003
Update of /var/cvs/lunar/theedge/var/lib/lunar/functions
In directory dbguin.lunar-linux.org:/tmp/cvs-serv23520
Modified Files:
check.lunar edit.lunar install.lunar modules.lunar sizes.lunar
temp.lunar tracking.lunar
Log Message:
install.lunar: fixed failure to correctly remove depends/module file
rename mv_edit() routine mod_v_safe_edit()
Index: check.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/check.lunar,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- check.lunar 11 Sep 2003 05:09:50 -0000 1.8
+++ check.lunar 1 Oct 2003 16:28:46 -0000 1.9
@@ -258,7 +258,7 @@
# here starts the real work:
MODULE=$1
- mv_edit $MODULE
+ mod_v_safe_edit $MODULE
# base vars needed to execute DEPENDS
SECTION=$(find_section $MODULE)
Index: edit.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/edit.lunar,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- edit.lunar 11 Sep 2003 05:09:50 -0000 1.9
+++ edit.lunar 1 Oct 2003 16:28:46 -0000 1.10
@@ -79,10 +79,10 @@
}
-# function : mv_edit
-# usage : mv_edit $VARIABLE
+# function : mod_v_safe_edit
+# usage : mod_v_safe_edit $VARIABLE
# purpose : creates a 'safe' value in variable "$MOD_V_SNAME"
-mv_edit() {
+mod_v_safe_edit() {
MOD_V_SNAME=$(echo $1 | sed 's:/:.:g')
return 0
}
Index: install.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/install.lunar,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- install.lunar 19 Sep 2003 21:32:02 -0000 1.19
+++ install.lunar 1 Oct 2003 16:28:46 -0000 1.20
@@ -83,10 +83,11 @@
# run the CONFIGURE script
run_configure() {
+ mod_v_safe_edit $MODULE
debug_msg "run_configure ($@)"
if [ -n "$RECONFIGURE" ]; then
- verbose_msg "Reconfiguring \"$MODULE\""
- rm -f $DEPENDS_CONFIG/$MODULE
+ verbose_msg "Reconfiguring \"$MOD_V_SNAME\""
+ rm -f $DEPENDS_CONFIG/$MOD_V_SNAME
remove_depends $MODULE
fi
@@ -124,7 +125,7 @@
stop_logging() {
debug_msg "stop_logging ($@)"
- mv_edit $MODULE
+ mod_v_safe_edit $MODULE
message "${MESSAGE_COLOR}Creating" \
"${FILE_COLOR}$COMPILE_LOGS/$MOD_V_SNAME-$VERSION.bz2" \
"${DEFAULT_COLOR}"
@@ -137,7 +138,7 @@
start_logging () {
debug_msg "start_logging ($@)"
- mv_edit $MODULE
+ mod_v_safe_edit $MODULE
export C_LOG=$(temp_create "${MOD_V_SNAME}.compile-log")
export C_FIFO=$(temp_create "${MOD_V_SNAME}.compile-fifo")
@@ -360,7 +361,7 @@
export INSTALLWATCHFILE=$(temp_create "$MODULE.installwatch")
# lock the module for installation, check for moonbase call
- mv_edit $MODULE
+ mod_v_safe_edit $MODULE
linING="/var/lock/installing.$MOD_V_SNAME"
if [ "$MODULE" == "moonbase" ] ; then
if ! current_locked && ! solo_locked ; then
Index: modules.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/modules.lunar,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- modules.lunar 11 Sep 2003 05:09:50 -0000 1.26
+++ modules.lunar 1 Oct 2003 16:28:46 -0000 1.27
@@ -200,7 +200,7 @@
SCRIPT_DIRECTORY=$MOONBASE/$SECTION/$1
run_module_file $1 DETAILS &> /dev/null &&
SOURCE_DIRECTORY=${SOURCE_DIRECTORY:-$BUILD_DIRECTORY/$1-$VERSION}
- mv_edit $1
+ mod_v_safe_edit $1
MODULE_CONFIG=${MODULE_CONFIG:-$DEPENDS_CONFIG/$MOD_V_SNAME}
return 0
Index: sizes.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/sizes.lunar,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sizes.lunar 11 Sep 2003 05:09:50 -0000 1.6
+++ sizes.lunar 1 Oct 2003 16:28:46 -0000 1.7
@@ -21,7 +21,7 @@
# purpose : finds the installed size of module in KB
find_module_size() {
#this functions checks the modules file if there is already size entry
- mv_edit $1
+ mod_v_safe_edit $1
module_size()
{
unset SIZE
Index: temp.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/temp.lunar,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- temp.lunar 11 Sep 2003 05:09:50 -0000 1.5
+++ temp.lunar 1 Oct 2003 16:28:46 -0000 1.6
@@ -20,7 +20,7 @@
temp_create() {
debug_msg "temp_create ($@)"
TMPDIR=${TMPDIR:-/var/tmp}
- mv_edit $1
+ mod_v_safe_edit $1
TMPFILE=$MOD_V_SNAME
if TMPFILE=$(mktemp -p "$TMPDIR" -t lunar.`basename $0`.$$.$TMPFILE.XXXXXXXXXX ) ; then
echo $TMPFILE
Index: tracking.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/tracking.lunar,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- tracking.lunar 11 Sep 2003 05:09:50 -0000 1.9
+++ tracking.lunar 1 Oct 2003 16:28:46 -0000 1.10
@@ -70,7 +70,7 @@
create_install_log() {
debug_msg "create_install_log ($@)"
- mv_edit $MODULE
+ mod_v_safe_edit $MODULE
TMP_INST_LOG=$(temp_create "install-log")
INST_LOG="$INSTALL_LOGS/$MOD_V_SNAME-$VERSION"
@@ -106,7 +106,7 @@
create_md5sum_log() {
debug_msg "create_md5sum_log ($@)"
- mv_edit $MODULE
+ mod_v_safe_edit $MODULE
rm -f $MD5SUM_LOGS/$MOD_V_SNAME-$VERSION &> /dev/null
@@ -120,7 +120,7 @@
create_install_cache() {
debug_msg "create_install_cache($@)"
- mv_edit $MODULE
+ mod_v_safe_edit $MODULE
if [ "$ARCHIVE" == "off" ] ; then
return
More information about the Lunar-commits
mailing list