Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

luci-app-package-manager: Fix upgrade action for apk #7375

Merged
merged 1 commit into from
Nov 3, 2024

Conversation

hnyman
Copy link
Contributor

@hnyman hnyman commented Nov 2, 2024

cc @Ansuel @aparcar

Fix upgrade action for apk by passing an attribute via 'handleInstall' to set correctly the command for 'handlePkg' in order to differentiate between install and upgrade actions. (Note: 'handleManualInstall' sets always 'install')
Adjust acl accordingly.

Remove extra whitespace.

Tested on live system for

  • both apk & opkg enables systems,
  • both install (single package and packages with dependencies to install) and upgrade.

apk

Executing package manager

(1/1) Upgrading luci-app-adblock (24.284.61488~02f2d47 -> 24.304.46082~f9899fd)
OK: 70 MiB in 307 packages

opkg

Executing package manager

Upgrading ca-bundle on root from 20230311-1 to 20240203-r1...
Downloading https://downloads.openwrt.org/snapshots/packages/aarch64_cortex-a53/base/ca-bundle_20240203-r1_all.ipk
Configuring ca-bundle.

Fix upgrade action for apk by passing an attribute to
differentiate between install and upgrade actions.
Adjust acl accordingly.

Remove extra whitespace.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
@hnyman hnyman merged commit 5c27cf3 into openwrt:master Nov 3, 2024
3 of 4 checks passed
@hnyman hnyman deleted the apkfix branch November 3, 2024 13:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants