kiss: let's try early error on ordering one more time

This commit is contained in:
Dylan Araps 2021-07-22 13:21:06 +03:00
parent 7eaa25ef54
commit 4bcefedb4b
No known key found for this signature in database
GPG Key ID: 13295DAC2CF13B5C

4
kiss
View File

@ -551,7 +551,7 @@ pkg_depends() {
die "Circular dependency detected $1 <> ${4##* }" die "Circular dependency detected $1 <> ${4##* }"
esac esac
! _pkg_find "$1" || ! [ -e "$repo_dir/depends" ] || ! pkg_find "$1" || ! [ -e "$repo_dir/depends" ] ||
# Recurse through the dependencies of the child packages. # Recurse through the dependencies of the child packages.
while read -r dep dep_type || ok "$dep"; do while read -r dep dep_type || ok "$dep"; do
@ -572,6 +572,8 @@ pkg_order() {
# pre-built tarballs if this is to be called from 'kiss i'. # pre-built tarballs if this is to be called from 'kiss i'.
unset order redro deps unset order redro deps
log "Ordering arguments list based on dependence"
for pkg do case $pkg in for pkg do case $pkg in
/*@*.tar.*) deps="$deps $pkg" ;; /*@*.tar.*) deps="$deps $pkg" ;;
*@*.tar.*) deps="$deps $ppwd/$pkg" ;; *@*.tar.*) deps="$deps $ppwd/$pkg" ;;