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

xbps_configure_pkg: do not flush pkgdb if state hasn't been changed.

Browse Source
This commit is contained in:
Juan RP 2012-10-26 10:24:26 +02:00
parent 89dadb0f20
commit 3e7f35bed1
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/package_configure.c
View File

@ -92,22 +92,23 @@ xbps_configure_pkg(struct xbps_handle *xhp,
prop_dictionary_get_cstring_nocopy(pkgd, "version", &version); prop_dictionary_get_cstring_nocopy(pkgd, "version", &version);
prop_dictionary_get_cstring_nocopy(pkgd, "pkgver", &pkgver); prop_dictionary_get_cstring_nocopy(pkgd, "pkgver", &pkgver);
if (check_state) { rv = xbps_pkg_state_dictionary(pkgd, &state);
rv = xbps_pkg_state_dictionary(pkgd, &state); xbps_dbg_printf(xhp, "%s: state %d rv %d\n", pkgname, state, rv);
xbps_dbg_printf(xhp, "%s: state %d rv %d\n", pkgname, state, rv); if (rv != 0) {
if (rv != 0) { xbps_dbg_printf(xhp, "%s: [configure] failed to get "
xbps_dbg_printf(xhp, "%s: [configure] failed to get " "pkg state: %s\n", pkgname, strerror(rv));
"pkg state: %s\n", pkgname, strerror(rv)); prop_object_release(pkgd);
prop_object_release(pkgd); return EINVAL;
return EINVAL; }
}
if (check_state) {
if (state == XBPS_PKG_STATE_INSTALLED) { if (state == XBPS_PKG_STATE_INSTALLED) {
if ((xhp->flags & XBPS_FLAG_FORCE_CONFIGURE) == 0) if ((xhp->flags & XBPS_FLAG_FORCE_CONFIGURE) == 0)
return 0; return 0;
} else if (state != XBPS_PKG_STATE_UNPACKED) } else if (state != XBPS_PKG_STATE_UNPACKED)
return EINVAL; return EINVAL;
} }
xbps_set_cb_state(xhp, XBPS_STATE_CONFIGURE, 0, pkgname, version, NULL); xbps_set_cb_state(xhp, XBPS_STATE_CONFIGURE, 0, pkgname, version, NULL);
buf = xbps_xasprintf("%s/metadata/%s/INSTALL", buf = xbps_xasprintf("%s/metadata/%s/INSTALL",
@ -146,6 +147,10 @@ xbps_configure_pkg(struct xbps_handle *xhp,
} }
} }
free(buf); free(buf);
if (state == XBPS_PKG_STATE_INSTALLED)
return rv;
rv = xbps_set_pkg_state_installed(xhp, pkgname, version, rv = xbps_set_pkg_state_installed(xhp, pkgname, version,
XBPS_PKG_STATE_INSTALLED); XBPS_PKG_STATE_INSTALLED);
if (rv != 0) { if (rv != 0) {