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

Fix xbps_configure_pkg() reporting old version when upgrading packages.

Browse Source 
--HG--
extra : convert_revision : xtraeme%40gmail.com-20090825040302-azurxpyalot07j81
This commit is contained in:
Juan RP 2009-08-25 06:03:02 +02:00
parent 14c9886cfc
commit 10531d7d45
4 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/xbps-bin/install.c
View File

@ -415,7 +415,8 @@ exec_transaction(struct transaction *trans)
*/ */
while ((obj = prop_object_iterator_next(trans->iter)) != NULL) { while ((obj = prop_object_iterator_next(trans->iter)) != NULL) {
prop_dictionary_get_cstring_nocopy(obj, "pkgname", &pkgname); prop_dictionary_get_cstring_nocopy(obj, "pkgname", &pkgname);
if ((rv = xbps_configure_pkg(pkgname, false)) != 0) { prop_dictionary_get_cstring_nocopy(obj, "version", &version);
if ((rv = xbps_configure_pkg(pkgname, version, false)) != 0) {
printf("Error configuring package %s (%s)\n", printf("Error configuring package %s (%s)\n",
pkgname, strerror(rv)); pkgname, strerror(rv));
return rv; return rv;

2
bin/xbps-bin/main.c
View File

@ -238,7 +238,7 @@ main(int argc, char **argv)
if (strcasecmp(argv[1], "all") == 0) if (strcasecmp(argv[1], "all") == 0)
rv = xbps_configure_all_pkgs(); rv = xbps_configure_all_pkgs();
else else
rv = xbps_configure_pkg(argv[1], true); rv = xbps_configure_pkg(argv[1], NULL, true);
} else if (strcasecmp(argv[0], "show-deps") == 0) { } else if (strcasecmp(argv[0], "show-deps") == 0) {
/* /*

2
include/xbps_api.h
View File

@ -68,7 +68,7 @@
#endif #endif
/* From lib/configure.c */ /* From lib/configure.c */
int xbps_configure_pkg(const char *, bool); int xbps_configure_pkg(const char *, const char *, bool);
int xbps_configure_all_pkgs(void); int xbps_configure_all_pkgs(void);
/* from lib/cmpver.c */ /* from lib/cmpver.c */

27
lib/configure.c
View File

@ -39,7 +39,7 @@ xbps_configure_all_pkgs(void)
prop_dictionary_t d; prop_dictionary_t d;
prop_object_t obj; prop_object_t obj;
prop_object_iterator_t iter; prop_object_iterator_t iter;
const char *pkgname; const char *pkgname, *version;
int rv = 0; int rv = 0;
pkg_state_t state = 0; pkg_state_t state = 0;
@ -53,11 +53,12 @@ xbps_configure_all_pkgs(void)
while ((obj = prop_object_iterator_next(iter)) != NULL) { while ((obj = prop_object_iterator_next(iter)) != NULL) {
prop_dictionary_get_cstring_nocopy(obj, "pkgname", &pkgname); prop_dictionary_get_cstring_nocopy(obj, "pkgname", &pkgname);
prop_dictionary_get_cstring_nocopy(obj, "version", &version);
if ((rv = xbps_get_pkg_state_dictionary(obj, &state)) != 0) if ((rv = xbps_get_pkg_state_dictionary(obj, &state)) != 0)
break; break;
if (state != XBPS_PKG_STATE_UNPACKED) if (state != XBPS_PKG_STATE_UNPACKED)
continue; continue;
if ((rv = xbps_configure_pkg(pkgname, false)) != 0) if ((rv = xbps_configure_pkg(pkgname, version, false)) != 0)
break; break;
} }
prop_object_iterator_release(iter); prop_object_iterator_release(iter);
@ -71,10 +72,10 @@ xbps_configure_all_pkgs(void)
* to installed. * to installed.
*/ */
int int
xbps_configure_pkg(const char *pkgname, bool check_state) xbps_configure_pkg(const char *pkgname, const char *version, bool check_state)
{ {
prop_dictionary_t pkgd; prop_dictionary_t pkgd;
const char *rootdir, *version; const char *rootdir, *lver;
char *buf; char *buf;
int rv = 0, flags = 0; int rv = 0, flags = 0;
pkg_state_t state = 0; pkg_state_t state = 0;
@ -96,17 +97,19 @@ xbps_configure_pkg(const char *pkgname, bool check_state)
reconfigure = true; reconfigure = true;
} else if (state != XBPS_PKG_STATE_UNPACKED) } else if (state != XBPS_PKG_STATE_UNPACKED)
return EINVAL; return EINVAL;
pkgd = xbps_find_pkg_installed_from_plist(pkgname);
if (pkgd == NULL)
return ENOENT;
prop_dictionary_get_cstring_nocopy(pkgd, "version", &lver);
prop_object_release(pkgd);
} else {
lver = version;
} }
pkgd = xbps_find_pkg_installed_from_plist(pkgname);
if (pkgd == NULL)
return ENOENT;
prop_dictionary_get_cstring_nocopy(pkgd, "version", &version);
prop_object_release(pkgd);
printf("%sonfiguring package %s-%s...\n", printf("%sonfiguring package %s-%s...\n",
reconfigure ? "Rec" : "C", pkgname, version); reconfigure ? "Rec" : "C", pkgname, lver);
buf = xbps_xasprintf(".%s/metadata/%s/INSTALL", buf = xbps_xasprintf(".%s/metadata/%s/INSTALL",
XBPS_META_PATH, pkgname); XBPS_META_PATH, pkgname);