diff options
author | dylan.araps@gmail.com <dylan.araps@gmail.com> | 2019-09-09 08:49:28 +0000 |
---|---|---|
committer | dylan.araps@gmail.com <dylan.araps@gmail.com> | 2019-09-09 08:49:28 +0000 |
commit | 9341f626e628b17b269292f1fa2f7cea0e2155e5 (patch) | |
tree | ab0f4aa98630a1f3dfbd8e3ee9cd6687e5c716e8 /kiss | |
parent | 89e2e5d153e888974189c4b6b847c2c953ac2346 (diff) | |
download | cpt-9341f626e628b17b269292f1fa2f7cea0e2155e5.tar.gz |
kiss: cleanup
FossilOrigin-Name: 5472ebe3d016dbcc2d34730a4d55641529afa2ddaccb4c0b72b9bb142a851f25
Diffstat (limited to 'kiss')
-rwxr-xr-x | kiss | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -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 |