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

xbps_configure_pkg: try to use pkgname if possible to configure a pkg.

Browse Source 
In pwwka's case for some reason the transaction was trying to configure
'man-pages-3.62_1' while in pkgdb there was only 'man-pages-3.55_1'.

By using the pkgname the pkg stored in pkgdb will be configured, without
caring what version it is.
This commit is contained in:
Juan RP
2014-03-13 21:28:31 +01:00
parent 56786ed315
commit cbbdc4c8bc
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/package_configure.c
View File

@ -87,13 +87,25 @@ xbps_configure_pkg(struct xbps_handle *xhp,
assert(pkgver != NULL); assert(pkgver != NULL);
pkgd = xbps_pkgdb_get_pkg(xhp, pkgver); if ((pkgname = xbps_pkg_name(pkgver)) == NULL) {
if (pkgd == NULL) xbps_dbg_printf(xhp, "[configure] cannot guess "
"pkgname for %s\n", pkgver);
/* assume pkgver == pkgname */
pkgname = strdup(pkgver);
assert(pkgname);
}
pkgd = xbps_pkgdb_get_pkg(xhp, pkgname);
if (pkgd == NULL) {
free(pkgname);
xbps_dbg_printf(xhp, "[configure] cannot find %s (%s) "
"in pkgdb\n", pkgname, pkgver);
return ENOENT; return ENOENT;
}
rv = xbps_pkg_state_dictionary(pkgd, &state); rv = xbps_pkg_state_dictionary(pkgd, &state);
xbps_dbg_printf(xhp, "%s: state %d rv %d\n", pkgver, state, rv); xbps_dbg_printf(xhp, "%s: state %d rv %d\n", pkgver, state, rv);
if (rv != 0) { if (rv != 0) {
free(pkgname);
xbps_dbg_printf(xhp, "%s: [configure] failed to get " xbps_dbg_printf(xhp, "%s: [configure] failed to get "
"pkg state: %s\n", pkgver, strerror(rv)); "pkg state: %s\n", pkgver, strerror(rv));
return EINVAL; return EINVAL;
@ -101,19 +113,18 @@ xbps_configure_pkg(struct xbps_handle *xhp,
if (check_state) { 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) {
free(pkgname);
return 0; return 0;
} else if (state != XBPS_PKG_STATE_UNPACKED) }
} else if (state != XBPS_PKG_STATE_UNPACKED) {
free(pkgname);
return EINVAL; return EINVAL;
} }
}
xbps_set_cb_state(xhp, XBPS_STATE_CONFIGURE, 0, pkgver, NULL); xbps_set_cb_state(xhp, XBPS_STATE_CONFIGURE, 0, pkgver, NULL);
/* internalize pkg dictionary from metadir */
pkgname = xbps_pkg_name(pkgver);
if (pkgname == NULL) /* assume pkgname */
pkgname = strdup(pkgver);
plist = xbps_xasprintf("%s/.%s.plist", xhp->metadir, pkgname); plist = xbps_xasprintf("%s/.%s.plist", xhp->metadir, pkgname);
free(pkgname); free(pkgname);