CVS: lunar/var/lib/lunar/functions build.lunar, 1.2,
1.3 depends.lunar, 1.4, 1.5 download.lunar, 1.8,
1.9 install.lunar, 1.3, 1.4 modules.lunar, 1.8,
1.9 sources.lunar, 1.4, 1.5
sofar at lunar-linux.org
sofar at lunar-linux.org
Sat Oct 4 20:13:37 GMT 2003
- Previous message: CVS: lunar/sbin lget,1.9,1.10 lin,1.17,1.18 lunar,1.8,1.9
- Next message: CVS: theedge/sbin lget,1.24,1.25 lin,1.68,1.69 lunar,1.24,1.25
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /var/cvs/lunar/lunar/var/lib/lunar/functions
In directory dbguin.lunar-linux.org:/tmp/cvs-serv16826/var/lib/lunar/functions
Modified Files:
build.lunar depends.lunar download.lunar install.lunar
modules.lunar sources.lunar
Log Message:
<sofar> I have a bugfix for the core here
<sofar> it involves -r being confused with --deps
<sofar> something broke in the core about 3/4 months back
<sofar> I just found it and fixed the problem, commit to lunar will follow shortly
<sofar> e.g. do a lin -r lunar.... you'll see 5 lunar questions but 20+ unwanted ones
<sofar> that is a BUG, and never was intentional.
<sofar> I also have changed lget behaviour, defaults to NOT download anything, and downloads everything with lget --all
<sofar> lemme see what else is in theere
<sofar> one cosmetic bug fix regarding download log
<sofar> lunar exile XXX can now also be called if a module is NOT installed
<sofar> FUZZY downloads now default to OFF
<sofar> and gpg: syntax has changed a bit
Index: build.lunar
===================================================================
RCS file: /var/cvs/lunar/lunar/var/lib/lunar/functions/build.lunar,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- build.lunar 14 Sep 2003 14:31:19 -0000 1.2
+++ build.lunar 4 Oct 2003 20:13:35 -0000 1.3
@@ -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/lunar/var/lib/lunar/functions/depends.lunar,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- depends.lunar 10 Aug 2003 01:16:22 -0000 1.4
+++ depends.lunar 4 Oct 2003 20:13:35 -0000 1.5
@@ -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/lunar/var/lib/lunar/functions/download.lunar,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- download.lunar 14 Sep 2003 14:31:19 -0000 1.8
+++ download.lunar 4 Oct 2003 20:13:35 -0000 1.9
@@ -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/lunar/var/lib/lunar/functions/install.lunar,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- install.lunar 19 Sep 2003 21:26:55 -0000 1.3
+++ install.lunar 4 Oct 2003 20:13:35 -0000 1.4
@@ -495,10 +495,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/lunar/var/lib/lunar/functions/modules.lunar,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- modules.lunar 10 Aug 2003 01:16:22 -0000 1.8
+++ modules.lunar 4 Oct 2003 20:13:35 -0000 1.9
@@ -303,8 +303,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/lunar/var/lib/lunar/functions/sources.lunar,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sources.lunar 10 Aug 2003 01:16:22 -0000 1.4
+++ sources.lunar 4 Oct 2003 20:13:35 -0000 1.5
@@ -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
- Previous message: CVS: lunar/sbin lget,1.9,1.10 lin,1.17,1.18 lunar,1.8,1.9
- Next message: CVS: theedge/sbin lget,1.24,1.25 lin,1.68,1.69 lunar,1.24,1.25
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Lunar-commits
mailing list