summaryrefslogtreecommitdiff
path: root/fullpkg
diff options
context:
space:
mode:
Diffstat (limited to 'fullpkg')
-rwxr-xr-xfullpkg20
1 files changed, 6 insertions, 14 deletions
diff --git a/fullpkg b/fullpkg
index f242039..6b940f3 100755
--- a/fullpkg
+++ b/fullpkg
@@ -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