From e35d2e94158927575efb27508ef89c5b04c74a33 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 12 Jul 2014 16:25:12 +0200 Subject: [PATCH] Revert "lib/transaction_ops.c: also check conflicts for pkgs without rdeps." This reverts commit e308097af5420ae64d1ef7cab5b997c405e4bc91. package conflicts are checked in xbps_transaction_prepare() already. --- lib/transaction_ops.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/transaction_ops.c b/lib/transaction_ops.c index 7c6814bc..3090f5bd 100644 --- a/lib/transaction_ops.c +++ b/lib/transaction_ops.c @@ -192,10 +192,7 @@ trans_find_pkg(struct xbps_handle *xhp, const char *pkg, bool reinstall) if (!xbps_dictionary_set_cstring_nocopy(pkg_repod, "transaction", reason)) return EINVAL; - /* - * Check if package has matched conflicts. - */ - xbps_pkg_find_conflicts(xhp, unsorted, pkg_repod); + /* * Add the pkg dictionary from repository's index dictionary into * the "unsorted" queue.