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

libxbps: fix eudev-libgudev -> libgudev fallout.

Browse Source 
Packages to be replaced must be collected *before* checking for
broken reverse dependencies, otherwise them will always be detected
as broken.
This commit is contained in:
Juan RP 2015-10-14 11:46:56 +02:00
parent c688808b2c
commit c457b594aa
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -1,5 +1,8 @@
xbps-0.48 (???): xbps-0.48 (???):
* libxbps: fix a bug where broken reverse dependencies would be detected
before detecting packages that need to be replaced in transaction.
* xbps-query(1): fail if unused arguments are supplied. * xbps-query(1): fail if unused arguments are supplied.
* libxbps: relative cachedir set via xbps.d(5) now work correctly. * libxbps: relative cachedir set via xbps.d(5) now work correctly.

16
lib/transaction_dictionary.c
View File

@ -299,6 +299,14 @@ xbps_transaction_prepare(struct xbps_handle *xhp)
} }
xbps_object_release(edges); xbps_object_release(edges);
/*
* Check for packages to be replaced.
*/
if ((rv = xbps_transaction_package_replace(xhp, pkgs)) != 0) {
xbps_object_release(xhp->transd);
xhp->transd = NULL;
return rv;
}
/* /*
* If there are missing deps or revdeps bail out. * If there are missing deps or revdeps bail out.
*/ */
@ -330,14 +338,6 @@ xbps_transaction_prepare(struct xbps_handle *xhp)
return ENOEXEC; return ENOEXEC;
} }
} }
/*
* Check for packages to be replaced.
*/
if ((rv = xbps_transaction_package_replace(xhp, pkgs)) != 0) {
xbps_object_release(xhp->transd);
xhp->transd = NULL;
return rv;
}
/* /*
* Add transaction stats for total download/installed size, * Add transaction stats for total download/installed size,
* number of packages to be installed, updated, configured * number of packages to be installed, updated, configured

1
lib/transaction_package_replace.c
View File

@ -121,6 +121,7 @@ xbps_transaction_package_replace(struct xbps_handle *xhp, xbps_array_t pkgs)
*/ */
xbps_dictionary_set_cstring_nocopy(instd, xbps_dictionary_set_cstring_nocopy(instd,
"transaction", "remove"); "transaction", "remove");
xbps_dictionary_set_bool(instd, "replaced", true);
if (!xbps_array_add_first(pkgs, instd)) { if (!xbps_array_add_first(pkgs, instd)) {
xbps_object_iterator_release(iter); xbps_object_iterator_release(iter);
free(pkgname); free(pkgname);

4
lib/transaction_revdeps.c
View File

@ -166,6 +166,10 @@ xbps_transaction_revdeps(struct xbps_handle *xhp, xbps_array_t pkgs)
* the transaction. * the transaction.
*/ */
if (strcmp(tract, "remove") == 0) { if (strcmp(tract, "remove") == 0) {
if (xbps_dictionary_get(obj, "replaced")) {
free(pkgname);
continue;
}
if (xbps_find_pkg_in_array(pkgs, pkgname, "remove")) { if (xbps_find_pkg_in_array(pkgs, pkgname, "remove")) {
free(pkgname); free(pkgname);
continue; continue;