forked from kiss-community/kiss
kiss: Fix error messages
This commit is contained in:
parent
69a4a5d255
commit
6415605174
8
kiss
8
kiss
@ -75,11 +75,11 @@ log() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
war() {
|
war() {
|
||||||
log "$1" "$2" WARNING
|
log "$1" "$2" "${3:-WARNING}"
|
||||||
}
|
}
|
||||||
|
|
||||||
die() {
|
die() {
|
||||||
log "$1" "$2" ERROR
|
log "$1" "$2" "${3:-ERROR}"
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -878,7 +878,7 @@ pkg_conflicts() {
|
|||||||
log "/sbin instead of /usr/bin (example)"
|
log "/sbin instead of /usr/bin (example)"
|
||||||
log "Before this package can be used as an alternative,"
|
log "Before this package can be used as an alternative,"
|
||||||
log "this must be fixed in $p_name. Contact the maintainer"
|
log "this must be fixed in $p_name. Contact the maintainer"
|
||||||
die "by checking 'git log' or by running 'kiss-maintainer'"
|
die "by finding their details via 'kiss-maintainer'" "" "!>"
|
||||||
}
|
}
|
||||||
done < "$cac_dir/$pid-c"
|
done < "$cac_dir/$pid-c"
|
||||||
|
|
||||||
@ -889,7 +889,7 @@ pkg_conflicts() {
|
|||||||
elif [ -s "$cac_dir/$pid-c" ]; then
|
elif [ -s "$cac_dir/$pid-c" ]; then
|
||||||
log "Package '$p_name' conflicts with another package" "" "!>"
|
log "Package '$p_name' conflicts with another package" "" "!>"
|
||||||
log "Run 'KISS_CHOICE=1 kiss i $p_name' to add conflicts" "" "!>"
|
log "Run 'KISS_CHOICE=1 kiss i $p_name' to add conflicts" "" "!>"
|
||||||
die "as alternatives."
|
die "as alternatives." "" "!>"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user