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

conflicts: add some debugging and remove wrong path.

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

9
lib/transaction_conflicts.c
View File

@ -100,7 +100,7 @@ pkg_conflicts_trans(struct xbps_handle *xhp, xbps_array_t array,
free(pkgname); free(pkgname);
xbps_dbg_printf(xhp, "found conflicting installed " xbps_dbg_printf(xhp, "found conflicting installed "
"pkg %s with pkg in transaction %s " "pkg %s with pkg in transaction %s "
"(matched by %s)\n", pkgver, repopkgver, cfpkg); "(matched by %s [trans])\n", pkgver, repopkgver, cfpkg);
buf = xbps_xasprintf("CONFLICT: %s with " buf = xbps_xasprintf("CONFLICT: %s with "
"installed pkg %s (matched by %s)", "installed pkg %s (matched by %s)",
repopkgver, pkgver, cfpkg); repopkgver, pkgver, cfpkg);
@ -131,7 +131,7 @@ pkg_conflicts_trans(struct xbps_handle *xhp, xbps_array_t array,
continue; continue;
} }
xbps_dbg_printf(xhp, "found conflicting pkgs in " xbps_dbg_printf(xhp, "found conflicting pkgs in "
"transaction %s <-> %s (matched by %s)\n", "transaction %s <-> %s (matched by %s [trans])\n",
pkgver, repopkgver, cfpkg); pkgver, repopkgver, cfpkg);
buf = xbps_xasprintf("CONFLICT: %s with " buf = xbps_xasprintf("CONFLICT: %s with "
"%s in transaction (matched by %s)", "%s in transaction (matched by %s)",
@ -171,9 +171,6 @@ 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);
@ -193,7 +190,7 @@ pkgdb_conflicts_cb(struct xbps_handle *xhp, xbps_object_t obj,
} }
free(pkgname); free(pkgname);
xbps_dbg_printf(xhp, "found conflicting pkgs in " xbps_dbg_printf(xhp, "found conflicting pkgs in "
"transaction %s <-> %s (matched by %s)\n", "transaction %s <-> %s (matched by %s [pkgdb])\n",
pkgver, repopkgver, cfpkg); pkgver, repopkgver, cfpkg);
buf = xbps_xasprintf("CONFLICT: %s with " buf = xbps_xasprintf("CONFLICT: %s with "
"%s in transaction (matched by %s)", "%s in transaction (matched by %s)",