From: Christian Marangi Date: Mon, 28 Oct 2024 10:48:48 +0000 (+0100) Subject: Revert "luci-app-opkg: fix passing wrong option on opkg update/install" X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=refs%2Fheads%2Fopenwrt-22.03;p=project%2Fluci.git Revert "luci-app-opkg: fix passing wrong option on opkg update/install" This reverts commit 4163e3810ac56339aa4baa6a1d072ab8fdd7b15d. Due to cache problem it's better to revert this minor fixup than adding a fixup on top of it. For OPKG it doesn't cause any problem as the extra unsupported options is just ignored. Signed-off-by: Christian Marangi --- 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 7ec7818150..f3d0194d97 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 @@ -983,10 +983,7 @@ function handleOpkg(ev) _('Waiting for the opkg %h command to complete…').format(cmd)) ]); - var argv = [ cmd ]; - - if (cmd == 'remove') - argv.push('--force-removal-of-dependent-packages') + var argv = [ cmd, '--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 649666c260..d6531a58e4 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,10 +17,9 @@ }, "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" ]