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

xbps_configure_pkg: set pkg state in our pkg dictionary from pkgdb.

Browse Source 
Replacing a dictionary while the iterator is held invalidates this iterator, thus
breaking the loop.

Thanks to pancake for finding this issue.
This commit is contained in:
Juan RP 2012-12-17 11:27:10 +01:00
parent 9d97d2952a
commit 6a60bceb54
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/package_configure.c
View File

@ -62,8 +62,11 @@ xbps_configure_packages(struct xbps_handle *xhp, bool flush)
while ((obj = prop_object_iterator_next(iter))) { while ((obj = prop_object_iterator_next(iter))) {
prop_dictionary_get_cstring_nocopy(obj, "pkgname", &pkgname); prop_dictionary_get_cstring_nocopy(obj, "pkgname", &pkgname);
rv = xbps_configure_pkg(xhp, pkgname, true, false, false); rv = xbps_configure_pkg(xhp, pkgname, true, false, false);
if (rv != 0) if (rv != 0) {
xbps_dbg_printf(xhp, "%s: failed to configure %s: %s\n",
__func__, pkgname, strerror(rv));
break; break;
}
} }
prop_object_iterator_release(iter); prop_object_iterator_release(iter);
@ -133,8 +136,7 @@ xbps_configure_pkg(struct xbps_handle *xhp,
return rv; return rv;
} }
rv = xbps_set_pkg_state_installed(xhp, pkgname, version, rv = xbps_set_pkg_state_dictionary(pkgd, XBPS_PKG_STATE_INSTALLED);
XBPS_PKG_STATE_INSTALLED);
if (rv != 0) { if (rv != 0) {
xbps_set_cb_state(xhp, XBPS_STATE_CONFIGURE_FAIL, rv, xbps_set_cb_state(xhp, XBPS_STATE_CONFIGURE_FAIL, rv,
pkgname, version, pkgname, version,