--- trunk/mage/usr/lib/mage/depwalker.sh 2013/10/10 11:05:34 2195 +++ trunk/mage/usr/lib/mage/depwalker.sh 2013/10/25 07:52:00 2274 @@ -33,13 +33,19 @@ echo " -b --pbuild build number of the package" echo " -m --method which calc method should be used:" echo " install, srcinstall, depend, srcdepend" - echo " upgrade, srcupgrade" + echo " upgrade, srcupgrade," + echo " install-build-prerequisites," + echo " pretend-build-prerequisites" + echo " -d --debug enable debug mode" echo echo "method, name, version and build must be given !" echo exit 1 } +# always default debug=0 +DEBUG=0 + # very basic getops for i in $* do @@ -49,6 +55,7 @@ --pver|-v) shift; PVER="$1" ;; --pbuild|-b) shift; PBUILD="$1" ;; --method|-m) shift; METHOD="$1" ;; + --debug|-d) shift; DEBUG=1 ;; --help|-h) usage ;; esac shift @@ -151,6 +158,28 @@ fi fi + if [[ ${METHOD} = install-build-prerequisites ]] || \ + [[ ${METHOD} = pretend-build-prerequisites ]] + then + # only one time + if [[ ${LOOP_COUNTER} -lt 1 ]] + then + # only if SDEPEND is not zero + if [ -n "${SDEPEND}" ] + then + # crlf is substantly needed !! + if [ -n "${MY_DEPEND}" ] + then + MY_DEPEND="${MY_DEPEND} + ${SDEPEND}" + else + MY_DEPEND="${SDEPEND}" + fi + fi + fi + LOOP_COUNTER=${LOOP_COUNTER}+1 + fi + unset DEPEND unset SDEPEND @@ -161,6 +190,11 @@ while read SYM DEPNAME do + if [[ ${DEBUG} = 1 ]] + then + echo "DEBUG: DEPNAME='${DEPNAME}'" >&2 + fi + # exclude empty depnames [[ -z ${DEPNAME} ]] && continue @@ -212,7 +246,8 @@ [[ ${METHOD} = pretend ]] || \ [[ ${METHOD} = srcpretend ]] || \ [[ ${METHOD} = uppretend ]] || \ - [[ ${METHOD} = srcuppretend ]] && \ + [[ ${METHOD} = srcuppretend ]] || \ + [[ ${METHOD} = pretend-build-prerequisites ]] && \ echo -n "Calculating dependencies ... " @@ -250,21 +285,27 @@ fi done else + LOOP_COUNTER=0 # get all dependencies of the package depwalking ${MAGEFILE} fi -# now add the package itself to the dependencies -# (if not exists already) -if checklist_alldeps "${MAGEFILE}" +if [[ ${METHOD} != install-build-prerequisites ]] && + [[ ${METHOD} != pretend-build-prerequisites ]] then - ALLDEPS="${ALLDEPS} ${MAGEFILE}" + # now add the package itself to the dependencies + # (if not exists already) + if checklist_alldeps "${MAGEFILE}" + then + ALLDEPS="${ALLDEPS} ${MAGEFILE}" + fi fi [[ ${METHOD} = pretend ]] || \ [[ ${METHOD} = srcpretend ]] || \ [[ ${METHOD} = uppretend ]] || \ - [[ ${METHOD} = srcuppretend ]] && \ + [[ ${METHOD} = srcuppretend ]] || \ + [[ ${METHOD} = pretend-build-prerequisites ]] && \ echo "done" @@ -272,7 +313,8 @@ if [[ ${METHOD} = pretend ]] || \ [[ ${METHOD} = srcpretend ]] || \ [[ ${METHOD} = uppretend ]] || \ - [[ ${METHOD} = srcuppretend ]] + [[ ${METHOD} = srcuppretend ]] || \ + [[ ${METHOD} = pretend-build-prerequisites ]] then # this is a little bit faster declare -i x=0 @@ -289,7 +331,7 @@ PBUILD="$(magename2pbuild ${i})" if [ -z "${list}" ] then - list="\t${COLBLUE}[${k}] ${COLGREEN}${PCAT}/${PNAME}-${PVER}-${PBUILD}${COLDEFAULT}" + list="\t${COLBLUE}[${k}] ${COLGREEN}${PCAT}/${PNAME}-${PVER}-${PBUILD}${COLDEFAULT}" else list="${list} \t${COLBLUE}[${k}] ${COLGREEN}${PCAT}/${PNAME}-${PVER}-${PBUILD}${COLDEFAULT}" @@ -331,5 +373,6 @@ [[ ${METHOD} = install ]] || \ [[ ${METHOD} = srcinstall ]] || \ [[ ${METHOD} = upgrade ]] || \ - [[ ${METHOD} = srcupgrade ]] && \ + [[ ${METHOD} = srcupgrade ]] || \ + [[ ${METHOD} = install-build-prerequisites ]] && \ echo "${ALLDEPS}"