From 79444786617ee442c2e16bc37651d9982cfcf474 Mon Sep 17 00:00:00 2001
From: Michał Masłowski <mtjm@mtjm.eu>
Date: Sat, 18 Feb 2012 13:45:31 +0100
Subject: Support running toru and toru-path via PATH.

---
 toru | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'toru')

diff --git a/toru b/toru
index 9616119..41acb18 100755
--- a/toru
+++ b/toru
@@ -12,7 +12,7 @@
 # * Possibility to hook up ABS dirs besides ABSROOT (low priority)
 # * Tell updates and non available binary packages (working on this)
 
-source $(dirname $0)/toru-utils
+source $(dirname $(command -v $0))/toru-utils
 
 # Saves contents on a named cache
 # $1 cache name (repo)
-- 
cgit v1.2.3-54-g00ecf


From 77647dc95bec7f72a5ecee7d303aa2802f39adb4 Mon Sep 17 00:00:00 2001
From: Michał Masłowski <mtjm@mtjm.eu>
Date: Sat, 18 Feb 2012 13:53:07 +0100
Subject: Fix some toru "unknown errors".

---
 toru | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'toru')

diff --git a/toru b/toru
index 41acb18..de0e92f 100755
--- a/toru
+++ b/toru
@@ -137,7 +137,7 @@ update() {
 
     fi
 
-    package_paths=($(read_cache ${_repo}.paths))
+    package_paths=($(read_cache ${_repo}.paths || true))
 
 # Inform how many PKGBUILDS were found and quit immediately if none
     $quiet || msg "Found $((${#pkgbuilds[*]}-1)) PKGBUILDs to update"
@@ -165,7 +165,7 @@ update() {
 
       for _pkg in ${pkgname[@]}; do
 # Keep removing unneeded stuff
-        unset package_${_pkg} >/dev/null 2>&1
+        unset package_${_pkg} >/dev/null 2>&1 || true
 # Fill the list of packages to find
         packages_in_abs+=($_pkg-$(get_full_version ${epoch:-0} $pkgver $pkgrel))
         package_paths+=($_pkg:$_pkgpath)
-- 
cgit v1.2.3-54-g00ecf


From 8327b7175f71ca224a3acadef5c83eac22970a1d Mon Sep 17 00:00:00 2001
From: Michał Masłowski <mtjm@mtjm.eu>
Date: Sat, 18 Feb 2012 14:13:29 +0100
Subject: Let toru ignore broken PKGBUILDs instead of failing.

---
 toru | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'toru')

diff --git a/toru b/toru
index de0e92f..a6c7b7d 100755
--- a/toru
+++ b/toru
@@ -148,7 +148,7 @@ update() {
       update_sync_file=true
 
 # Load PKGBUILD's metadata
-      source ${_pkgbuild}
+      source ${_pkgbuild} || continue
 
 # Guess pkgbase from PKGBUILD's basedir
       _pkgpath=$(dirname "${_pkgbuild}")
-- 
cgit v1.2.3-54-g00ecf


From ef12ca293c2a85fde729c39900fa2d481c8b42da Mon Sep 17 00:00:00 2001
From: Michał Masłowski <mtjm@mtjm.eu>
Date: Sat, 18 Feb 2012 14:23:16 +0100
Subject: Use a consistently plural message.

---
 toru | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'toru')

diff --git a/toru b/toru
index a6c7b7d..e878b3a 100755
--- a/toru
+++ b/toru
@@ -199,7 +199,7 @@ update() {
       split_pkgname_from_pkgver ${TMPDIR}/packages_in_abs | sort -k1b,1 > ${TMPDIR}/in_abs
       split_pkgname_from_pkgver ${TMPDIR}/packages_in_sync | sort -k1b,1 > ${TMPDIR}/in_sync
 
-      $quiet || msg "This packages are available to update"
+      $quiet || msg "These packages are available to update"
 # Join both files by pkgname, the end result is:
 # pkgname syncver absver
       join ${TMPDIR}/in_sync ${TMPDIR}/in_abs | \
-- 
cgit v1.2.3-54-g00ecf


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 +++++-----------
 toru         |  3 +--
 2 files changed, 6 insertions(+), 13 deletions(-)

(limited to 'toru')

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
diff --git a/toru b/toru
index e878b3a..766331b 100755
--- a/toru
+++ b/toru
@@ -297,8 +297,7 @@ while getopts 'haqfpum' arg; do
       f) force=true ;;
       u) commands+=(update);;
       p) shift $(( OPTIND - 1 ))
-          where_is "$1"
-          exit $?;;
+          where_is "$1" || exit 1;;
       m) commands+=(missing);;
   esac
 
-- 
cgit v1.2.3-54-g00ecf