Carbs Packaging Tools
git clone git://git.carbslinux.org/cpt
Log | Files | Refs | README | LICENSE

commit e00c0488206148ce75bfe8d808f6f978879ef2c8
parent c671e4cd10611f85a46daee6c3eafdf4c2c04b71
Author: Dylan Araps <dylan.araps@gmail.com>
Date:   Tue, 11 Feb 2020 12:04:44 +0200

kiss: more helpful message

Mkiss | 10++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/kiss b/kiss @@ -769,8 +769,14 @@ pkg_conflicts() { # Move the conflicting file to the choices directory # and name it according to the format above. mv -f "$tar_dir/$p_name/$con" \ - "$tar_dir/$p_name/$cho_dir/$p_name$con_name" 2>/dev/null || - die "File must be in ${con%/*} and not a symlink to it" + "$tar_dir/$p_name/$cho_dir/$p_name$con_name" 2>/dev/null || { + log "File must be in ${con%/*} and not a symlink to it" + log "This usually occurs when a binary is installed to" + log "/sbin instead of /usr/bin (example)" + log "Before this package can be used as an alternative," + log "this must be fixed in $p_name. Contact the maintainer" + die "by checking 'git log' or by running 'kiss-maintainer'" + } # Rewrite the package's manifest to update its location # to its new spot (and name) in the choices directory.