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

conflicts: fix previous again...

Browse Source
This commit is contained in:
Juan RP 2015-11-12 12:54:53 +01:00
parent 3a5f1f8ad5
commit 6a59b65e28
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/transaction_conflicts.c
View File

@ -90,7 +90,9 @@ pkg_conflicts_trans(struct xbps_handle *xhp, xbps_array_t array,
if ((tpkgd = xbps_find_pkg_in_array(array, pkgname, NULL))) {
xbps_dictionary_get_cstring_nocopy(tpkgd,
"transaction", &tract);
if (!strcmp(tract, "install") || !strcmp(tract, "update")) {
if (!strcmp(tract, "install") ||
!strcmp(tract, "update") ||
!strcmp(tract, "hold")) {
free(pkgname);
continue;
}
@ -126,7 +128,7 @@ pkg_conflicts_trans(struct xbps_handle *xhp, xbps_array_t array,
if (xbps_dictionary_get_cstring_nocopy(pkgd,
"transaction", &tract)) {
if (!strcmp(tract, "remove") || !strcmp(tract, "hold"))
return;
continue;
}
xbps_dbg_printf(xhp, "found conflicting pkgs in "
"transaction %s <-> %s (matched by %s)\n",