diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-24 18:54:02 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-24 18:54:02 -0300 |
commit | 987763361d5e98a0158b65487619b14c9bd05457 (patch) | |
tree | 5c64ce3217f6038d1f5d28a751f48d3930a511ea /fullpkg-find | |
parent | ee706c5c36fd8993905a14aa2afeb5951dac6ec9 (diff) | |
parent | b4aae66a7c3ba3eec714ca6cc11cd9913b5cf2fd (diff) |
Merge branch 'master' into fauno
Diffstat (limited to 'fullpkg-find')
-rwxr-xr-x | fullpkg-find | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/fullpkg-find b/fullpkg-find index 8c0c063..9ddfa08 100755 --- a/fullpkg-find +++ b/fullpkg-find @@ -80,17 +80,16 @@ find_deps() { local found=false # TODO change for where_is or toru-path - local pkgdir=$(toru -p ${_dep}) + # May fail, e.g. since abslibre-mips64el doesn't include + # arch=any packages. + local pkgdir=$(toru -p ${_dep}) || true if [ -n "$pkgdir" -a -d "${pkgdir}" ]; then found=true pushd "${pkgdir}" > /dev/null # runs itself on dep's PKGBUILD dir - $0 -l ${next_level} ${build_dir} - -# probable circular deps - [ $? -eq 20 ] && return 20 + $0 -l ${next_level} ${build_dir} || return $? popd > /dev/null fi @@ -188,13 +187,8 @@ fi find_deps || { # Probable circular deps - if [ "$?" -eq 20 ]; then - -# Show error only on level 0 - if [ "$LEVEL" -eq 0 ]; then + if [ "$?" -eq 20 -a "$LEVEL" -eq 0 ]; then error "Check for circular deps on $build_dir/BUILDORDER"; - fi - fi # Pass message 20 exit 20 |