bonsai/kiss
3
0
Fork 0
forked from kiss-community/kiss
Code Issues 2 Pull Requests Projects Releases Activity

kiss: more depends fixes

Browse Source
This commit is contained in:
Dylan Araps 2021-07-06 19:53:49 +03:00
parent d267e2106e
commit fe1d610054
No known key found for this signature in database
GPG Key ID: 13295DAC2CF13B5C
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kiss
View File

@ -409,10 +409,9 @@ pkg_depends() {
# Resolve all dependencies and generate an ordered list. The deepest # Resolve all dependencies and generate an ordered list. The deepest
# dependencies are listed first and then the parents in reverse order. # dependencies are listed first and then the parents in reverse order.
contains "$deps" "$1" || { contains "$deps" "$1" || {
# Filter out non-explicit, aleady installed dependencies. # Filter out non-explicit, already installed packages.
if [ "$3" ] && [ -z "$2" ] && pkg_list "$1" >/dev/null 2>&1; then [ -z "$3" ] || [ "$2" ] || contains "$explicit" "$1" ||
return ! pkg_list "$1" >/dev/null 2>&1 || return
fi
# Detect circular dependencies and bail out. # Detect circular dependencies and bail out.
# Looks for multiple repeating patterns of (dep dep_parent) (5 is max). # Looks for multiple repeating patterns of (dep dep_parent) (5 is max).
@ -693,6 +692,7 @@ pkg_build() {
contains "$deps" "$pkg" || set -- "$@" "$pkg" contains "$deps" "$pkg" || set -- "$@" "$pkg"
done done
explicit_cnt=$# explicit_cnt=$#
explicit=$*
log "Building: explicit: $*${deps:+, implicit: ${deps## }}" log "Building: explicit: $*${deps:+, implicit: ${deps## }}"