diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-01 17:16:48 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-01 17:16:48 -0300 |
commit | 46798e856bcfa70791e19e7729322ad2f425d157 (patch) | |
tree | 66aad71e0a139d190fe06b6475c575e962b17d02 /fullpkg | |
parent | 4c4f7255e97bde5524e3798b4b777a94e37da23d (diff) |
PKGBUILD path caching
* Toru is overly complex
* Moved path caching to toru-path. Run it without arguments to update the
PKGBUILD paths cache
* Updated fullpkg to check this new paths cache
Diffstat (limited to 'fullpkg')
-rwxr-xr-x | fullpkg | 20 |
1 files changed, 6 insertions, 14 deletions
@@ -44,17 +44,8 @@ usage() { # Look in all caches but pick the first one # TODO move to a toru flag (-p?) where_is() { - local _repo - local _path - for _repo in ${REPOS[@]}; do - _path=$(grep "^${1}:" "${TORUPATH}/${_repo}.paths.cache" 2>/dev/null| \ - cut -d: -f2 2>/dev/null) - - [ -n "${_path}" ] && break - done - - echo ${_path} - + grep -m1 "^${1}:" "${TORUPATH}/paths" 2>/dev/null| \ + cut -d: -f2 2>/dev/null } # Removes a package from the buildorder @@ -147,6 +138,8 @@ find_deps() { for _dep in ${deps[@]}; do + msg2 "Checking ${_dep}" + local found=false local pkgdir=$(where_is ${_dep}) @@ -160,9 +153,8 @@ find_deps() { # probable circular deps [ $? -eq 20 ] && return 20 popd > /dev/null - fi - - if ! (( found )); then + else + error "Not found" echo "dep_not_found:$_dep" >>$build_dir/log fi |