From bd4ad7b0baa3c95c5c8ee88c1aa372030fc6a47a Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 27 Aug 2021 02:06:57 +0100 Subject: [PATCH] auc: update to version 0.2.4 A stray ')' made auc skip the check if all mandatory fields of a branch are present. Fix paranthesis in that if-clause to actually check for all fields. Don't even fetch package lists if checking only for release. Signed-off-by: Daniel Golle --- utils/auc/Makefile | 2 +- utils/auc/src/auc.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/utils/auc/Makefile b/utils/auc/Makefile index 216048765..fb011cb6d 100644 --- a/utils/auc/Makefile +++ b/utils/auc/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=auc -PKG_VERSION:=0.2.3 +PKG_VERSION:=0.2.4 PKG_RELEASE:=$(AUTORELEASE) PKG_LICENSE:=GPL-3.0 diff --git a/utils/auc/src/auc.c b/utils/auc/src/auc.c index 2b7a430c7..5a8cf6548 100644 --- a/utils/auc/src/auc.c +++ b/utils/auc/src/auc.c @@ -1156,9 +1156,9 @@ static void process_branch(struct blob_attr *branch, bool only_active) /* mandatory fields */ if (!(tb[BRANCH_ENABLED] && blobmsg_get_bool(tb[BRANCH_ENABLED]) && - tb[BRANCH_NAME] && tb[BRANCH_PATH]) && tb[BRANCH_PATH_PACKAGES] && + tb[BRANCH_NAME] && tb[BRANCH_PATH] && tb[BRANCH_PATH_PACKAGES] && tb[BRANCH_UPDATES] && tb[BRANCH_PUBKEY] && tb[BRANCH_REPOS] && - tb[BRANCH_VERSIONS] && tb[BRANCH_TARGETS]) + tb[BRANCH_VERSIONS] && tb[BRANCH_TARGETS])) return; brname = blobmsg_get_string(tb[BRANCH_NAME]); @@ -1707,15 +1707,15 @@ int main(int args, char *argv[]) { else if (revcmp > 0) upg_check |= PKG_DOWNGRADE; - if ((rc = request_packages(branch))) - goto freebranches; - if (release_only && !(upg_check & PKG_UPGRADE)) { fprintf(stderr, "Nothing to be updated. Use '-f' to force.\n"); rc=0; goto freebranches; } + if ((rc = request_packages(branch))) + goto freebranches; + upg_check |= check_installed_packages(reqbuf.head); if (upg_check & PKG_ERROR) { rc=-ENOPKG;