diff options
| author | Christian Marangi <ansuelsmth@gmail.com> | 2024-10-23 00:21:35 +0200 |
|---|---|---|
| committer | Paul Donald <newtwen+github@gmail.com> | 2024-10-24 00:04:46 +0200 |
| commit | 3a8e9baf32242f30cf65791b61c460413bd115ce (patch) | |
| tree | 10d2af34380cf89a68f110894fadef26258a61c5 /applications/luci-app-opkg | |
| parent | 55e08bedf255c654201fd89761d205ceebae00e1 (diff) | |
luci-app-opkg: fix passing wrong option on opkg update/install
Fix passing wrong option on opkg update/install. While starting to
introduce support for APK in the opkg module, it was notice that
--force-removal-of-dependent-packages was always passed even with update
and install command.
This was probably a leftover/oversight of old one. To fix this, limit
this option only on remove and also update the acl.d to support single
call to update or install.
Fixes: 9b25031cb29b ("luci-app-opkg: rework backend operations")
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Diffstat (limited to 'applications/luci-app-opkg')
| -rw-r--r-- | applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js | 5 | ||||
| -rw-r--r-- | applications/luci-app-opkg/root/usr/share/rpcd/acl.d/luci-app-opkg.json | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js b/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js index 053d74729f..1ed27447f1 100644 --- a/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js +++ b/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js @@ -984,7 +984,10 @@ function handleOpkg(ev) _('Waiting for the <em>opkg %h</em> command to complete…').format(cmd)) ]); - var argv = [ cmd, '--force-removal-of-dependent-packages' ]; + var argv = [ cmd ]; + + if (cmd == 'remove') + argv.push('--force-removal-of-dependent-packages') if (rem && rem.checked) argv.push('--autoremove'); diff --git a/applications/luci-app-opkg/root/usr/share/rpcd/acl.d/luci-app-opkg.json b/applications/luci-app-opkg/root/usr/share/rpcd/acl.d/luci-app-opkg.json index d6531a58e4..649666c260 100644 --- a/applications/luci-app-opkg/root/usr/share/rpcd/acl.d/luci-app-opkg.json +++ b/applications/luci-app-opkg/root/usr/share/rpcd/acl.d/luci-app-opkg.json @@ -17,9 +17,10 @@ }, "write": { "file": { + "/usr/libexec/opkg-call install": [ "exec" ], "/usr/libexec/opkg-call install *": [ "exec" ], "/usr/libexec/opkg-call remove *": [ "exec" ], - "/usr/libexec/opkg-call update *": [ "exec" ], + "/usr/libexec/opkg-call update": [ "exec" ], "/etc/opkg.conf": [ "write" ], "/etc/opkg/*.conf": [ "write" ], "/tmp/upload.ipk": [ "write" ] |