From c94648630c874eeed8925830ebc9c4b55fb9ad21 Mon Sep 17 00:00:00 2001 From: Duncan Overbruck Date: Sat, 12 Jun 2021 15:55:21 +0200 Subject: [PATCH] lib/transaction_commit.c: don't configure already unpacked packages early This makes --unpack-only also skip the configure for currently unpacked packages and configures unpacked packages together with all other pckages. --- lib/transaction_commit.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/lib/transaction_commit.c b/lib/transaction_commit.c index dd09bebe..41353ae1 100644 --- a/lib/transaction_commit.c +++ b/lib/transaction_commit.c @@ -173,18 +173,6 @@ xbps_transaction_commit(struct xbps_handle *xhp) } continue; - } else if (ttype == XBPS_TRANS_CONFIGURE) { - /* - * Reconfigure pending package. - */ - rv = xbps_configure_pkg(xhp, pkgver, false, false); - if (rv != 0) { - xbps_dbg_printf(xhp, "[trans] failed to " - "configure %s: %s\n", pkgver, strerror(rv)); - goto out; - } - continue; - } else if (ttype == XBPS_TRANS_UPDATE) { /* * Update a package: execute pre-remove action of @@ -254,8 +242,7 @@ xbps_transaction_commit(struct xbps_handle *xhp) while ((obj = xbps_object_iterator_next(iter)) != NULL) { xbps_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver); ttype = xbps_transaction_pkg_type(obj); - if (ttype == XBPS_TRANS_REMOVE || ttype == XBPS_TRANS_HOLD || - ttype == XBPS_TRANS_CONFIGURE) { + if (ttype == XBPS_TRANS_REMOVE || ttype == XBPS_TRANS_HOLD) { xbps_dbg_printf(xhp, "%s: skipping configuration for " "%s: %d\n", __func__, pkgver, ttype); continue;