kiss: fixes
This commit is contained in:
parent
16f82b50df
commit
2c0ca29e37
12
kiss
12
kiss
|
@ -288,6 +288,8 @@ pkg_order() {
|
||||||
# Order a list of packages based on dependence and
|
# Order a list of packages based on dependence and
|
||||||
# take into account pre-built tarballs if this is
|
# take into account pre-built tarballs if this is
|
||||||
# to be called from 'kiss i'.
|
# to be called from 'kiss i'.
|
||||||
|
order=; redro=; deps=
|
||||||
|
|
||||||
for pkg; do
|
for pkg; do
|
||||||
case $pkg in
|
case $pkg in
|
||||||
*.tar.gz) deps="$deps $pkg " ;;
|
*.tar.gz) deps="$deps $pkg " ;;
|
||||||
|
@ -720,14 +722,16 @@ pkg_conflicts() {
|
||||||
|
|
||||||
[ -s "$cac_dir/$pid-m" ] || return 0
|
[ -s "$cac_dir/$pid-m" ] || return 0
|
||||||
|
|
||||||
# Count the total conflicts to determine when to
|
# Enable alternatives automatically if it is safe to do so.
|
||||||
# automatically enable the alternatives feature.
|
# This checks to see that the package that is about to be installed
|
||||||
con_total=$("$grep" -Fxf "$cac_dir/$pid-m" -- "$@" | wc -l)
|
# doesn't overwrite anything it shouldn't in '/var/db/kiss/installed'.
|
||||||
|
"$grep" -Fxf "$cac_dir/$pid-m" -- "$@" |
|
||||||
|
"$grep" -q ":/var/db/kiss/installed/" || choice_auto=1
|
||||||
|
|
||||||
# Use 'grep' to list matching lines between the to
|
# Use 'grep' to list matching lines between the to
|
||||||
# be installed package's manifest and the above filtered
|
# be installed package's manifest and the above filtered
|
||||||
# list.
|
# list.
|
||||||
if [ "$KISS_CHOICE" = 1 ] || [ "$con_total" -le 10 ]; then
|
if [ "$KISS_CHOICE" != 0 ] && [ "$choice_auto" = 1 ]; then
|
||||||
"$grep" -Fxf "$cac_dir/$pid-m" -- "$@" |
|
"$grep" -Fxf "$cac_dir/$pid-m" -- "$@" |
|
||||||
|
|
||||||
# This is a novel way of offering an "alternatives" system.
|
# This is a novel way of offering an "alternatives" system.
|
||||||
|
|
Loading…
Reference in New Issue