From 4511e581b25bbb8353eea005150396b4894dbfb0 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 31 Mar 2012 10:08:52 +0200 Subject: [PATCH] xbps_configure_pkg: improve error messages. --- NEWS | 2 +- lib/package_configure.c | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index debd2aad..aa3c67c9 100644 --- a/NEWS +++ b/NEWS @@ -26,7 +26,7 @@ xbps-0.14 (2012-02-28): * Fixed 'xbps-bin reconfigure all' (regression added in 0.13). * While resolving dependencies check if required dependency is matched - any virtual package already added in transaction, on match use it. + with any virtual package already added in transaction, on match use it. * Only accept binary packages compressed in gzip, bzip2 and xz formats. Profiling tests showed that libarchive wasted a considerable amount of diff --git a/lib/package_configure.c b/lib/package_configure.c index 39cab38f..163d06a4 100644 --- a/lib/package_configure.c +++ b/lib/package_configure.c @@ -91,7 +91,7 @@ xbps_configure_pkg(const char *pkgname, if (check_state) { rv = xbps_pkg_state_installed(pkgname, &state); - xbps_dbg_printf("%s-%s: state %d\n", pkgname, version, state); + xbps_dbg_printf("%s: state %d rv %d\n", pkgname, state, rv); if (rv == ENOENT) { /* * package not installed or has been removed. @@ -153,6 +153,10 @@ xbps_configure_pkg(const char *pkgname, } } else { if (errno != ENOENT) { + xbps_set_cb_state(XBPS_STATE_CONFIGURE_FAIL, errno, + pkgname, lver, + "%s: [configure] INSTALL script cannot be " + "executed: %s", pkgver, strerror(errno)); free(buf); free(pkgver); return errno; @@ -168,8 +172,13 @@ xbps_configure_pkg(const char *pkgname, pkgver, strerror(rv)); } free(pkgver); - if (flush) - rv = xbps_pkgdb_update(true); - + if (flush) { + if ((rv = xbps_pkgdb_update(true)) != 0) { + xbps_set_cb_state(XBPS_STATE_CONFIGURE_FAIL, rv, + pkgname, lver, + "%s: [configure] failed to update pkgdb: %s\n", + pkgver, strerror(rv)); + } + } return rv; }