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

libxbps: fixed issue #116 (vpkg does not replace pkg with update in trans).

Browse Source 
Thanks to @dominikh for the test case.
This commit is contained in:
Juan RP
2015-10-19 18:01:43 +02:00
parent 4e446968c5
commit b069eb14ae
3 changed files with 53 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/transaction_package_replace.c
View File

@ -88,10 +88,16 @@ xbps_transaction_package_replace(struct xbps_handle *xhp, xbps_array_t pkgs)
xbps_dictionary_get_bool(instd, "automatic-install", &instd_auto);
reppkgd = xbps_find_pkg_in_array(pkgs, curpkgname, NULL);
if (reppkgd) {
const char *rpkgver;
xbps_dictionary_get_cstring_nocopy(reppkgd,
"pkgver", &rpkgver);
xbps_dictionary_get_cstring_nocopy(reppkgd,
"transaction", &tract);
if (strcmp(tract, "remove") == 0)
continue;
if (xbps_pkgpattern_match(rpkgver, pattern) == 0)
continue;
/*
* Package contains replaces="pkgpattern", but the
* package that should be replaced is also in the
@ -99,8 +105,16 @@ xbps_transaction_package_replace(struct xbps_handle *xhp, xbps_array_t pkgs)
*/
xbps_dictionary_set_bool(reppkgd,
"automatic-install", instd_auto);
xbps_dictionary_set_cstring_nocopy(reppkgd,
"transaction", "remove");
xbps_dictionary_set_bool(reppkgd,
"replaced", true);
xbps_array_replace_dict_by_name(pkgs,
reppkgd, curpkgname);
xbps_dbg_printf(xhp,
"Package `%s' in transaction will be "
"replaced by `%s', matched with `%s'\n",
curpkgver, pkgver, pattern);
continue;
}
/*