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

xbps_transaction_update_packages: make packages on hold work (duh!).

Browse Source 
(cherry picked from commit aa154199a6d7d89bfe040755be289b1d827c5727)
This commit is contained in:
Juan RP 2012-09-25 15:02:57 +02:00
parent 7d4ecbb0ab
commit 01915e3030
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/transaction_ops.c
View File

@ -204,7 +204,7 @@ xbps_transaction_update_packages(struct xbps_handle *xhp)
{ {
prop_object_t obj; prop_object_t obj;
const char *pkgname, *holdpkgname; const char *pkgname, *holdpkgname;
bool newpkg_found = false; bool foundhold = false, newpkg_found = false;
int rv = 0; int rv = 0;
size_t i, x; size_t i, x;
@ -219,9 +219,14 @@ xbps_transaction_update_packages(struct xbps_handle *xhp)
if (strcmp(pkgname, holdpkgname) == 0) { if (strcmp(pkgname, holdpkgname) == 0) {
xbps_dbg_printf(xhp, "[rpool] package %s on hold, " xbps_dbg_printf(xhp, "[rpool] package %s on hold, "
"ignoring updates.\n", pkgname); "ignoring updates.\n", pkgname);
continue; foundhold = true;
break;
} }
} }
if (foundhold) {
foundhold = false;
continue;
}
rv = transaction_find_pkg(xhp, pkgname, false, true, rv = transaction_find_pkg(xhp, pkgname, false, true,
false, TRANS_UPDATE); false, TRANS_UPDATE);
if (rv == 0) if (rv == 0)