From 9341f626e628b17b269292f1fa2f7cea0e2155e5 Mon Sep 17 00:00:00 2001 From: "dylan.araps@gmail.com" Date: Mon, 9 Sep 2019 08:49:28 +0000 Subject: kiss: cleanup FossilOrigin-Name: 5472ebe3d016dbcc2d34730a4d55641529afa2ddaccb4c0b72b9bb142a851f25 --- kiss | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/kiss b/kiss index ba657b3..2b59569 100755 --- a/kiss +++ b/kiss @@ -589,13 +589,11 @@ pkg_conflicts() { # Go through the manifest list and filter out the # package which will be installed. for manifest; do - manifest_name=${manifest%/*} - manifest_name=${manifest_name##*/} - shift - [ "$manifest_name" = "$pkg_name" ] && - continue + case $manifest in + */$pkg_name/manifest) continue + esac set -- "$@" "$manifest" done -- cgit v1.2.3