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

xbps_transaction_package_replace: ignore pkgs on hold.

Browse Source
This commit is contained in:
Juan RP 2020-01-25 11:19:54 +01:00
parent 31a8dd15d0
commit a29f4709d0
No known key found for this signature in database
GPG Key ID: AF19F6CB482F9368
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/transaction_package_replace.c
View File

@ -57,9 +57,9 @@ xbps_transaction_package_replace(struct xbps_handle *xhp, xbps_array_t pkgs)
while ((obj2 = xbps_object_iterator_next(iter)) != NULL) { while ((obj2 = xbps_object_iterator_next(iter)) != NULL) {
xbps_dictionary_t instd, reppkgd; xbps_dictionary_t instd, reppkgd;
const char *tract, *pattern, *curpkgver; const char *pattern = NULL, *curpkgver = NULL;
char *curpkgname; char *curpkgname;
bool instd_auto = false; bool instd_auto = false, hold = false;
pattern = xbps_string_cstring_nocopy(obj2); pattern = xbps_string_cstring_nocopy(obj2);
/* /*
@ -72,6 +72,10 @@ xbps_transaction_package_replace(struct xbps_handle *xhp, xbps_array_t pkgs)
xbps_dictionary_get_cstring_nocopy(instd, xbps_dictionary_get_cstring_nocopy(instd,
"pkgver", &curpkgver); "pkgver", &curpkgver);
/* ignore pkgs on hold mode */
if (xbps_dictionary_get_bool(instd, "hold", &hold))
continue;
curpkgname = xbps_pkg_name(curpkgver); curpkgname = xbps_pkg_name(curpkgver);
assert(curpkgname); assert(curpkgname);
/* /*
@ -88,13 +92,13 @@ xbps_transaction_package_replace(struct xbps_handle *xhp, xbps_array_t pkgs)
xbps_dictionary_get_bool(instd, "automatic-install", &instd_auto); xbps_dictionary_get_bool(instd, "automatic-install", &instd_auto);
reppkgd = xbps_find_pkg_in_array(pkgs, curpkgname, NULL); reppkgd = xbps_find_pkg_in_array(pkgs, curpkgname, NULL);
if (reppkgd) { if (reppkgd) {
const char *rpkgver; const char *rpkgver = NULL, *tract = NULL;
xbps_dictionary_get_cstring_nocopy(reppkgd, xbps_dictionary_get_cstring_nocopy(reppkgd,
"pkgver", &rpkgver); "pkgver", &rpkgver);
xbps_dictionary_get_cstring_nocopy(reppkgd, xbps_dictionary_get_cstring_nocopy(reppkgd,
"transaction", &tract); "transaction", &tract);
if (strcmp(tract, "remove") == 0) if (!strcmp(tract, "remove") || !strcmp(tract, "hold"))
continue; continue;
if (!xbps_match_virtual_pkg_in_dict(reppkgd, pattern) && if (!xbps_match_virtual_pkg_in_dict(reppkgd, pattern) &&
!xbps_pkgpattern_match(rpkgver, pattern)) !xbps_pkgpattern_match(rpkgver, pattern))