diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-22 13:36:04 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-22 13:36:04 -0300 |
commit | 2dd17dbe005b9d87a1d629e8fb029ae10f493790 (patch) | |
tree | 83fcf1b2d1e7b9fe97cb4955bce7d1dac848deb4 /treepkg | |
parent | b8d0640c2d882e514a583e372bb26280a60aa604 (diff) | |
parent | b3b52d5c4a3cbcdeb505b099230107b830290e8e (diff) |
Merge branch 'master' into newroot
Conflicts:
treepkg
Diffstat (limited to 'treepkg')
-rwxr-xr-x | treepkg | 18 |
1 files changed, 6 insertions, 12 deletions
@@ -81,17 +81,8 @@ bury() { } || return 1 } -# Finds a PKGBUILD on toru's path cache -# Look in all caches but pick the first one -# TODO move to a toru flag (-p?) -where_is() { - grep "^${1}:" "${TORUPATH}/paths" 2>/dev/null| \ - tail -n1 2>/dev/null|\ - cut -d: -f2 2>/dev/null -} - # Guess the repo from the pkgbase path -# $1 path, pwd or where_is +# $1 path, pwd or toru-where guess_repo() { basename "$(dirname "${1}")" } @@ -166,11 +157,14 @@ if ! ${BUILDNOW}; then # NOTE: getting depends from package() is a PITA for _dep in ${deps[@]}; do -# Move the dependency one step deeper in the tree if we were going to build it before +# Move deps deeper in the tree if +# pkgbase - dep1 +# \ dep2 - dep1 +# dep1 should be depth + 1 egrep -q ";${_dep};" "${BUILDORDER}" && bury "${_dep}" ${NEXTDEPTH} # Ask toru where's a PKGBUILD - depdir="$(where_is ${_dep})" + depdir="$(toru-where ${_dep})" if [ -z "${depdir}" -o ! -d "${depdir}" ]; then # We specify the pkgname because we can't source the dep PKGBUILD |