--- trunk/mage/usr/lib/mage/depwalker.sh 2011/12/28 09:54:25 1559 +++ trunk/mage/usr/lib/mage/depwalker.sh 2011/12/28 09:59:15 1562 @@ -21,27 +21,6 @@ source ${MLIBDIR}/mage4.functions.sh || \ die "mage functions missing" -# for tests only -# source /home/tjoke/alx-cvs/magellan-src/mage/usr/lib/mage/mage.rc.global -# source /etc/mage.rc -# source /home/tjoke/alx-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh -# MLIBDIR=/home/tjoke/alx-cvs/magellan-src/mage/usr/lib/mage - -# not serious if missing, only needed for colors -[ -f /etc/init.d/functions ] && source /etc/init.d/functions - -# disable colors if wanted -if [[ ${NOCOLORS} = true ]] -then - COLRED="" - COLGREEN="" - COLYELLOW="" - COLBLUE="" - COLMAGENTA="" - COLWHITE="" - COLDEFAULT="" -fi - usage() { echo @@ -206,7 +185,7 @@ PVER="$(magename2pver ${HIGHEST_DEPFILE})" PBUILD="$(magename2pbuild ${HIGHEST_DEPFILE})" - ## check ob schon in ALLDEPS enthalten dann mach weiter + ## dep already in ALLDEPS? then going on # usage of fgrep is extremly slow and consumes a lot of cpu power #if [ -z "$(echo ${ALLDEPS} | fgrep "${HIGHEST_DEPFILE}")" ] @@ -225,11 +204,6 @@ return 0 } - -### abort if this package is already installed (retval 3) -# maybe later ? -#[ -d ${INSTALLDB}/${PCAT}/${PNAME}-${PVER}-${PBUILD} ] && exit 3 - [[ ${METHOD} = pretend ]] || \ [[ ${METHOD} = srcpretend ]] || \ [[ ${METHOD} = uppretend ]] || \ @@ -263,7 +237,7 @@ PVER="$(magename2pver ${MAGEFILE})" PBUILD="$(magename2pbuild ${MAGEFILE})" - # do not wander files which are installed + # do not walk files which are installed if [ ! -d ${INSTALLDB}/${PCAT}/${PNAME}-${PVER}-${PBUILD} ] then # get dependencies the package @@ -279,7 +253,7 @@ fi done else - # get dependencies the package + # get all dependencies of the package rumwandern ${MAGEFILE} # now add the package itself to the dependencies @@ -346,6 +320,3 @@ [[ ${METHOD} = upgrade ]] || \ [[ ${METHOD} = srcupgrade ]] && \ echo "${ALLDEPS}" - -# delete ${BUILDDIR}/virtuals if exists as not needed anymore -#[ -d ${BUILDDIR}/virtuals ] && rm -rf ${BUILDDIR}/virtuals