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

Fixed 'xbps-bin reconfigure all' regression added in 0.13.

Browse Source
This commit is contained in:
Juan RP 2012-02-28 21:16:41 +01:00
parent 79e499e2b5
commit 216673aa4a
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -1,5 +1,7 @@
xbps-0.14 (???): xbps-0.14 (???):
* Fixed 'xbps-bin reconfigure all' (regression added in 0.13).
* While resolving dependencies check if required dependency is matched * While resolving dependencies check if required dependency is matched
any virtual package already added in transaction, on match use it. any virtual package already added in transaction, on match use it.

31
lib/package_configure.c
View File

@ -46,26 +46,27 @@
* member, the package (or packages) will be reconfigured even if its * member, the package (or packages) will be reconfigured even if its
* state is XBPS_PKG_STATE_INSTALLED. * state is XBPS_PKG_STATE_INSTALLED.
*/ */
static int
configure_pkgs_cb(prop_object_t obj, void *arg, bool *done)
{
const char *pkgname, *version;
(void)arg;
(void)done;
prop_dictionary_get_cstring_nocopy(obj, "pkgname", &pkgname);
prop_dictionary_get_cstring_nocopy(obj, "version", &version);
return xbps_configure_pkg(pkgname, version, true, false, false);
}
int int
xbps_configure_packages(bool flush) xbps_configure_packages(bool flush)
{ {
struct xbps_handle *xhp = xbps_handle_get();
prop_object_t obj;
const char *pkgname, *version;
size_t i;
int rv; int rv;
rv = xbps_pkgdb_foreach_cb(configure_pkgs_cb, NULL); if ((rv = xbps_pkgdb_init(xhp)) != 0)
if (rv == 0 && flush) return rv;
for (i = 0; i < prop_array_count(xhp->pkgdb); i++) {
obj = prop_array_get(xhp->pkgdb, i);
prop_dictionary_get_cstring_nocopy(obj, "pkgname", &pkgname);
prop_dictionary_get_cstring_nocopy(obj, "version", &version);
rv = xbps_configure_pkg(pkgname, version, true, false, false);
if (rv != 0)
break;
}
if (flush)
rv = xbps_pkgdb_update(true); rv = xbps_pkgdb_update(true);
return rv; return rv;