libxbps: extend the fix for #116 even more for the expected case.

This now catches both test cases correctly.
This commit is contained in:
Juan RP
2015-10-19 18:19:24 +02:00
parent b069eb14ae
commit 103caf0694
2 changed files with 38 additions and 2 deletions

View File

@ -96,7 +96,8 @@ xbps_transaction_package_replace(struct xbps_handle *xhp, xbps_array_t pkgs)
"transaction", &tract);
if (strcmp(tract, "remove") == 0)
continue;
if (xbps_pkgpattern_match(rpkgver, pattern) == 0)
if (!xbps_match_virtual_pkg_in_dict(reppkgd, pattern) &&
!xbps_pkgpattern_match(rpkgver, pattern))
continue;
/*
* Package contains replaces="pkgpattern", but the