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

conflicts: ignore pkgs to be removed in transaction.

Browse Source
This commit is contained in:
Juan RP 2015-11-09 16:00:15 +01:00
parent 9b0cde3267
commit 182e5bb421
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/transaction_conflicts.c
View File

@ -39,13 +39,19 @@ pkg_conflicts_trans(struct xbps_handle *xhp, xbps_array_t array,
xbps_dictionary_t pkgd, tpkgd; xbps_dictionary_t pkgd, tpkgd;
xbps_object_t obj; xbps_object_t obj;
xbps_object_iterator_t iter; xbps_object_iterator_t iter;
const char *cfpkg, *repopkgver, *pkgver; const char *cfpkg, *repopkgver, *pkgver, *atract;
char *pkgname, *repopkgname, *buf; char *pkgname, *repopkgname, *buf;
pkg_cflicts = xbps_dictionary_get(pkg_repod, "conflicts"); pkg_cflicts = xbps_dictionary_get(pkg_repod, "conflicts");
if (xbps_array_count(pkg_cflicts) == 0) if (xbps_array_count(pkg_cflicts) == 0)
return; return;
if (xbps_dictionary_get_cstring_nocopy(pkg_repod, "transaction", &atract)) {
/* ignore pkgs to be removed */
if (strcmp(atract, "remove") == 0)
return;
}
trans_cflicts = xbps_dictionary_get(xhp->transd, "conflicts"); trans_cflicts = xbps_dictionary_get(xhp->transd, "conflicts");
xbps_dictionary_get_cstring_nocopy(pkg_repod, "pkgver", &repopkgver); xbps_dictionary_get_cstring_nocopy(pkg_repod, "pkgver", &repopkgver);
repopkgname = xbps_pkg_name(repopkgver); repopkgname = xbps_pkg_name(repopkgver);