From 3a5f1f8ad532acbadec6251fbbe93a7101ca17a6 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 12 Nov 2015 12:41:36 +0100 Subject: [PATCH] conflicts: really ignore on hold pkgs from pkgdb. --- lib/transaction_conflicts.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/transaction_conflicts.c b/lib/transaction_conflicts.c index 7baaa111..22bb778e 100644 --- a/lib/transaction_conflicts.c +++ b/lib/transaction_conflicts.c @@ -169,6 +169,9 @@ pkgdb_conflicts_cb(struct xbps_handle *xhp, xbps_object_t obj, if (xbps_find_pkg_in_array(pkgs, repopkgname, NULL)) { free(repopkgname); return 0; + } else if (xbps_dictionary_get(obj, "hold")) { + free(repopkgname); + return 0; } iter = xbps_array_iterator(pkg_cflicts);