emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conflicts: really ignore on hold pkgs from pkgdb.

Browse Source
This commit is contained in:
Juan RP 2015-11-12 12:41:36 +01:00
parent 784e43d876
commit 3a5f1f8ad5
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/transaction_conflicts.c
View File

@ -169,6 +169,9 @@ pkgdb_conflicts_cb(struct xbps_handle *xhp, xbps_object_t obj,
if (xbps_find_pkg_in_array(pkgs, repopkgname, NULL)) { if (xbps_find_pkg_in_array(pkgs, repopkgname, NULL)) {
free(repopkgname); free(repopkgname);
return 0; return 0;
} else if (xbps_dictionary_get(obj, "hold")) {
free(repopkgname);
return 0;
} }
iter = xbps_array_iterator(pkg_cflicts); iter = xbps_array_iterator(pkg_cflicts);