CVS: brutus/elaine/lunar+versions/functions check.lunar, 1.2,
1.3 edit.lunar, 1.2, 1.3 install.lunar, 1.4, 1.5 modules.lunar,
1.2, 1.3 sizes.lunar, 1.1, 1.2 temp.lunar, 1.2,
1.3 tracking.lunar, 1.2, 1.3
elaine at lunar-linux.org
elaine at lunar-linux.org
Sun Sep 7 12:12:32 GMT 2003
Update of /var/cvs/lunar/brutus/elaine/lunar+versions/functions
In directory dbguin.lunar-linux.org:/tmp/cvs-serv24231/functions
Modified Files:
check.lunar edit.lunar install.lunar modules.lunar sizes.lunar
temp.lunar tracking.lunar
Log Message:
hacks to make lvu/lrm work with module/v.v form modules, fixed failure
to set SIZE in state/lunar/packages Dependencies seem to work now
Index: check.lunar
===================================================================
RCS file: /var/cvs/lunar/brutus/elaine/lunar+versions/functions/check.lunar,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- check.lunar 6 Sep 2003 20:26:40 -0000 1.2
+++ check.lunar 7 Sep 2003 12:12:30 -0000 1.3
@@ -258,7 +258,7 @@
# here starts the real work:
MODULE=$1
- mv_edit( $MODULE )
+ mv_edit $MODULE
# base vars needed to execute DEPENDS
SECTION=$(find_section $MODULE)
Index: edit.lunar
===================================================================
RCS file: /var/cvs/lunar/brutus/elaine/lunar+versions/functions/edit.lunar,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- edit.lunar 6 Sep 2003 20:26:40 -0000 1.2
+++ edit.lunar 7 Sep 2003 12:12:30 -0000 1.3
@@ -83,6 +83,6 @@
# usage : mv_edit $VARIABLE
# purpose : creates a 'safe' value in variable "$MOD_V_SNAME"
mv_edit() {
- MOD_SNAME=$(echo $1 | sed 's:/:.:g')
+ MOD_V_SNAME=$(echo $1 | sed 's:/:.:g')
return 0
}
Index: install.lunar
===================================================================
RCS file: /var/cvs/lunar/brutus/elaine/lunar+versions/functions/install.lunar,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- install.lunar 6 Sep 2003 20:26:40 -0000 1.4
+++ install.lunar 7 Sep 2003 12:12:30 -0000 1.5
@@ -124,7 +124,7 @@
stop_logging() {
debug_msg "stop_logging ($@)"
- mv_edit( $MODULE )
+ mv_edit $MODULE
message "${MESSAGE_COLOR}Creating" \
"${FILE_COLOR}$COMPILE_LOGS/$MOD_V_SNAME-$VERSION.bz2" \
"${DEFAULT_COLOR}"
@@ -137,7 +137,7 @@
start_logging () {
debug_msg "start_logging ($@)"
- mv_edit( $MODULE )
+ mv_edit $MODULE
export C_LOG=$(temp_create "${MOD_V_SNAME}.compile-log")
export C_FIFO=$(temp_create "${MOD_V_SNAME}.compile-fifo")
@@ -360,7 +360,7 @@
export INSTALLWATCHFILE=$(temp_create "$MODULE.installwatch")
# lock the module for installation, check for moonbase call
- mv_edit( $MODULE )
+ mv_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/brutus/elaine/lunar+versions/functions/modules.lunar,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- modules.lunar 6 Sep 2003 20:26:40 -0000 1.2
+++ modules.lunar 7 Sep 2003 12:12:30 -0000 1.3
@@ -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 )
+ mv_edit $1
MODULE_CONFIG=${MODULE_CONFIG:-$DEPENDS_CONFIG/$MOD_V_SNAME}
return 0
Index: sizes.lunar
===================================================================
RCS file: /var/cvs/lunar/brutus/elaine/lunar+versions/functions/sizes.lunar,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sizes.lunar 5 Sep 2003 01:15:08 -0000 1.1
+++ sizes.lunar 7 Sep 2003 12:12:30 -0000 1.2
@@ -21,6 +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
module_size()
{
unset SIZE
@@ -40,14 +41,14 @@
module_size $1 $VERSION && return
# no :( lets dig through logs
- [ -e "$INSTALL_LOGS/$1-$VERSION" ] &&
+ [ -e "$INSTALL_LOGS/$MOD_V_SNAME-$VERSION" ] &&
while read LINE
do
[ -f "$LINE" ] &&
SIZE0=`du "$LINE" |
cut -f 1-1` &&
SIZE=$((SIZE0+SIZE))
- done <$INSTALL_LOGS/$1-$VERSION &&
+ done <$INSTALL_LOGS/$MOD_V_SNAME-$VERSION &&
echo ${SIZE}KB ||
message "${PROBLEM_COLOR}Install log for $1 is not found${DEFAULT_COLOR}"
}
Index: temp.lunar
===================================================================
RCS file: /var/cvs/lunar/brutus/elaine/lunar+versions/functions/temp.lunar,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- temp.lunar 6 Sep 2003 20:26:40 -0000 1.2
+++ temp.lunar 7 Sep 2003 12:12:30 -0000 1.3
@@ -20,7 +20,7 @@
temp_create() {
debug_msg "temp_create ($@)"
TMPDIR=${TMPDIR:-/var/tmp}
- mv_edit($1)
+ mv_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/brutus/elaine/lunar+versions/functions/tracking.lunar,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- tracking.lunar 6 Sep 2003 20:26:40 -0000 1.2
+++ tracking.lunar 7 Sep 2003 12:12:30 -0000 1.3
@@ -70,7 +70,7 @@
create_install_log() {
debug_msg "create_install_log ($@)"
- mv_edit( $MODULE )
+ mv_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 )
+ mv_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 )
+ mv_edit $MODULE
if [ "$ARCHIVE" == "off" ] ; then
return
More information about the Lunar-commits
mailing list