36 lines
1.0 KiB
Diff
36 lines
1.0 KiB
Diff
commit aa154199a6d7d89bfe040755be289b1d827c5727
|
|
Author: Juan RP <xtraeme@gmail.com>
|
|
Date: Tue Sep 25 15:02:57 2012 +0200
|
|
|
|
xbps_transaction_update_packages: make packages on hold work (duh!).
|
|
|
|
diff --git a/lib/transaction_ops.c b/lib/transaction_ops.c
|
|
index aa26279..666bd38 100644
|
|
--- lib/transaction_ops.c
|
|
+++ lib/transaction_ops.c
|
|
@@ -204,7 +204,7 @@ xbps_transaction_update_packages(struct xbps_handle *xhp)
|
|
{
|
|
prop_object_t obj;
|
|
const char *pkgname, *holdpkgname;
|
|
- bool newpkg_found = false;
|
|
+ bool foundhold = false, newpkg_found = false;
|
|
int rv = 0;
|
|
size_t i, x;
|
|
|
|
@@ -219,9 +219,14 @@ xbps_transaction_update_packages(struct xbps_handle *xhp)
|
|
if (strcmp(pkgname, holdpkgname) == 0) {
|
|
xbps_dbg_printf(xhp, "[rpool] package %s on hold, "
|
|
"ignoring updates.\n", pkgname);
|
|
- continue;
|
|
+ foundhold = true;
|
|
+ break;
|
|
}
|
|
}
|
|
+ if (foundhold) {
|
|
+ foundhold = false;
|
|
+ continue;
|
|
+ }
|
|
rv = transaction_find_pkg(xhp, pkgname, false, true,
|
|
false, TRANS_UPDATE);
|
|
if (rv == 0)
|