From 4ecfa39446c156e4283dae252532ce8548c72652 Mon Sep 17 00:00:00 2001 From: merakor Date: Wed, 23 Jun 2021 21:18:05 +0000 Subject: pkg_conflicts(): Remember to remove previous conflict checker FossilOrigin-Name: 76313c31f354c6cae7116d8bd48252e423c904dac984e759ed8f0109f13408cf --- src/cpt-lib.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/cpt-lib.in b/src/cpt-lib.in index b91a5a3..0d418e6 100644 --- a/src/cpt-lib.in +++ b/src/cpt-lib.in @@ -1320,8 +1320,6 @@ pkg_conflicts() { # information multiple times. Storing it in the cache dir allows us # to be lazy as they'll be automatically removed on script end. sed '/\/$/d' "$@" | sort "$CPT_TMPDIR/$pid/manifest" - | uniq -d > "$CPT_TMPDIR/$pid/conflict" ||: - "$grep" -Fxf "$CPT_TMPDIR/$pid/manifest" -- "$@" > "$CPT_TMPDIR/$pid/conflict" ||: - # Enable alternatives automatically if it is safe to do so. # This checks to see that the package that is about to be installed -- cgit v1.2.3