Merge branch 'master' into newroot

Conflicts:
	treepkg

1 files changed, 6 insertions, 12 deletions

diff --git a/treepkg b/treepkg
index d05f05e..00ec0e0 100755
--- a/treepkg
+++ b/treepkg
@@ -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