mirror of
https://codeberg.org/kiss-community/kiss
synced 2024-09-28 12:22:39 -06:00
kiss: Fix pkg_depends
This commit is contained in:
parent
52572be0be
commit
746ad439a4
14
kiss
14
kiss
@ -383,20 +383,16 @@ pkg_depends() {
|
|||||||
die "Circular dependency detected $1 <> ${4##* }"
|
die "Circular dependency detected $1 <> ${4##* }"
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
# Skip traversing over depends files of make dependencies which exist
|
||||||
|
# in the binary cache.
|
||||||
|
if [ "$5" != "make" ] || { [ "$5" = "make" ] && ! pkg_cache "$1"; }; then
|
||||||
_f=$(pkg_find "$1" 2>/dev/null)/depends ||:
|
_f=$(pkg_find "$1" 2>/dev/null)/depends ||:
|
||||||
|
|
||||||
# Recurse through the dependencies of the child packages.
|
# Recurse through the dependencies of the child packages.
|
||||||
! [ -e "$_f" ] || while read -r dep dep_type || [ "$dep" ]; do
|
! [ -e "$_f" ] || while read -r dep dep_type || [ "$dep" ]; do
|
||||||
# Skip comments.
|
! [ "${dep##\#*}" ] || pkg_depends "$dep" '' "$3" "$4 $1" "$dep_type"
|
||||||
[ "${dep##\#*}" ] || continue
|
|
||||||
|
|
||||||
# Skip make depends if unneeded.
|
|
||||||
case $dep_type in make)
|
|
||||||
! pkg_cache "$1" || continue
|
|
||||||
esac
|
|
||||||
|
|
||||||
pkg_depends "$dep" '' "$3" "$4 $1"
|
|
||||||
done < "$_f" ||:
|
done < "$_f" ||:
|
||||||
|
fi
|
||||||
|
|
||||||
# After child dependencies are added to the list,
|
# After child dependencies are added to the list,
|
||||||
# add the package which depends on them.
|
# add the package which depends on them.
|
||||||
|
Loading…
Reference in New Issue
Block a user