openwrt-mirror/luci
1
0
Fork 0
mirror of https://github.com/openwrt/luci.git synced 2025-12-21 17:04:35 +04:00
Code Issues Packages Projects Releases Wiki Activity

luci-app-opkg: fix passing wrong option on opkg update/install

Browse Source 
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: 9b25031cb2 ("luci-app-opkg: rework backend operations")
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
(cherry picked from commit 3a8e9baf32)
This commit is contained in:
Christian Marangi
2024-10-23 00:21:35 +02:00
committed by Paul Donald
parent 910cf4daac
commit 4163e3810a
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js
View File

@@ -983,7 +983,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');

3
applications/luci-app-opkg/root/usr/share/rpcd/acl.d/luci-app-opkg.json
View File

@@ -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" ]