Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

auc: update to version 0.2.4

Browse source 
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 <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2021-08-27 02:06:57 +01:00
parent 2edbc4c805
commit bd4ad7b0ba
No known key found for this signature in database
GPG key ID: 5A8F39C31C3217CA
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
utils/auc/Makefile
View file

@ -5,7 +5,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=auc PKG_NAME:=auc
PKG_VERSION:=0.2.3 PKG_VERSION:=0.2.4
PKG_RELEASE:=$(AUTORELEASE) PKG_RELEASE:=$(AUTORELEASE)
PKG_LICENSE:=GPL-3.0 PKG_LICENSE:=GPL-3.0

10
utils/auc/src/auc.c
View file

@ -1156,9 +1156,9 @@ static void process_branch(struct blob_attr *branch, bool only_active)
/* mandatory fields */ /* mandatory fields */
if (!(tb[BRANCH_ENABLED] && blobmsg_get_bool(tb[BRANCH_ENABLED]) && 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_UPDATES] && tb[BRANCH_PUBKEY] && tb[BRANCH_REPOS] &&
tb[BRANCH_VERSIONS] && tb[BRANCH_TARGETS]) tb[BRANCH_VERSIONS] && tb[BRANCH_TARGETS]))
return; return;
brname = blobmsg_get_string(tb[BRANCH_NAME]); brname = blobmsg_get_string(tb[BRANCH_NAME]);
@ -1707,15 +1707,15 @@ int main(int args, char *argv[]) {
else if (revcmp > 0) else if (revcmp > 0)
upg_check |= PKG_DOWNGRADE; upg_check |= PKG_DOWNGRADE;
if ((rc = request_packages(branch)))
goto freebranches;
if (release_only && !(upg_check & PKG_UPGRADE)) { if (release_only && !(upg_check & PKG_UPGRADE)) {
fprintf(stderr, "Nothing to be updated. Use '-f' to force.\n"); fprintf(stderr, "Nothing to be updated. Use '-f' to force.\n");
rc=0; rc=0;
goto freebranches; goto freebranches;
} }
if ((rc = request_packages(branch)))
goto freebranches;
upg_check |= check_installed_packages(reqbuf.head); upg_check |= check_installed_packages(reqbuf.head);
if (upg_check & PKG_ERROR) { if (upg_check & PKG_ERROR) {
rc=-ENOPKG; rc=-ENOPKG;