From 54b6cb03b60d1834130fa289188e9f232fab5898 Mon Sep 17 00:00:00 2001
From: Michał Masłowski <mtjm@mtjm.eu>
Date: Sat, 18 Feb 2012 14:44:22 +0100
Subject: Show a useful error message if a dependency is not found.

Should stop the build, somehow doesn't.
---
 fullpkg-find | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'fullpkg-find')

diff --git a/fullpkg-find b/fullpkg-find
index 8c0c063..e38014e 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})
+        local pkgdir=$(toru -p ${_dep} \
+            || error "dependency %s of %s not found" "${_dep}" "${pkgbase}" \
+            && exit 1)
 
         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
-- 
cgit v1.2.3-54-g00ecf


From b4aae66a7c3ba3eec714ca6cc11cd9913b5cf2fd Mon Sep 17 00:00:00 2001
From: Michał Masłowski <mtjm@mtjm.eu>
Date: Sat, 18 Feb 2012 16:07:11 +0100
Subject: Don't error on unfound package, explain why it occurs.

---
 fullpkg-find | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'fullpkg-find')

diff --git a/fullpkg-find b/fullpkg-find
index e38014e..9ddfa08 100755
--- a/fullpkg-find
+++ b/fullpkg-find
@@ -80,9 +80,9 @@ find_deps() {
 
         local found=false
 # TODO change for where_is or toru-path
-        local pkgdir=$(toru -p ${_dep} \
-            || error "dependency %s of %s not found" "${_dep}" "${pkgbase}" \
-            && exit 1)
+        # 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
-- 
cgit v1.2.3-54-g00ecf