--- trunk/mage/usr/lib/mage/depwalker.sh 2011/12/28 09:59:15 1562 +++ trunk/mage/usr/lib/mage/depwalker.sh 2013/07/15 08:04:58 2141 @@ -98,8 +98,8 @@ } ##################### -## rumwandern /path/to/mage/file/.mage -rumwandern() +## depwalking /path/to/mage/file/.mage +depwalking() { unset DEPEND unset SDEPEND @@ -179,6 +179,11 @@ fi HIGHEST_DEPFILE=$(dep2highest_magefile "${DEPNAME}") + if [[ -z ${HIGHEST_DEPFILE} ]] + then + INVALID_DEPS+=" ${DEPNAME}:${DFILE}" + continue + fi PCAT="$(magename2pcat ${HIGHEST_DEPFILE})" PNAME="$(magename2pname ${HIGHEST_DEPFILE})" @@ -191,10 +196,10 @@ #if [ -z "$(echo ${ALLDEPS} | fgrep "${HIGHEST_DEPFILE}")" ] if checklist_alldeps "${HIGHEST_DEPFILE}" then - ### check ob DFILE schon installiert ist ### + ### check if the dependency is already installed ### if [ ! -d ${MROOT}${INSTALLDB}/${PCAT}/${PNAME}-${PVER}-${PBUILD} ] then - rumwandern ${HIGHEST_DEPFILE} + depwalking ${HIGHEST_DEPFILE} ALLDEPS="${ALLDEPS} ${HIGHEST_DEPFILE}" fi fi @@ -241,7 +246,7 @@ if [ ! -d ${INSTALLDB}/${PCAT}/${PNAME}-${PVER}-${PBUILD} ] then # get dependencies the package - rumwandern ${MAGEFILE} + depwalking ${MAGEFILE} # now add the package itself to the dependencies # (if not exists already) @@ -254,7 +259,7 @@ done else # get all dependencies of the package - rumwandern ${MAGEFILE} + depwalking ${MAGEFILE} # now add the package itself to the dependencies ALLDEPS="${ALLDEPS} ${MAGEFILE}" @@ -299,6 +304,18 @@ echo -e "${list}" echo + if [[ ! -z ${INVALID_DEPS} ]] + then + echo -e "${COLRED}Invalid dependencies found:${COLDEFAULT}" + for i in ${INVALID_DEPS} + do + _dep="${i%%:*}" + _mage="${i##*:}" + echo -e "${COLRED} '${_dep}' -> '${_mage}'${COLDEFAULT}" + done + echo + fi + if [[ ! -z ${NO_UPGRADE_CANDIDATE} ]] then echo -e "${COLRED}Currently no candidates found for:${COLDEFAULT}"