summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2022-06-03 13:36:02 +0200
committerJo-Philipp Wich <jo@mein.io>2022-06-03 13:38:14 +0200
commit1cf976c2b3faa28f7416f11babbb9128dff29520 (patch)
treea8ead91b25b1737d111ad4c31f6b848c52cb821f
parent7387ec8e18c95b8a250b22715a3b9909dd2646ad (diff)
luci-app-opkg: fix parsing package dependencies with version constraints
Due to improper ordering of regexp alternatives, version constraint operators might get undermatched. Fixes: https://github.com/openwrt/openwrt/issues/9982 Signed-off-by: Jo-Philipp Wich <jo@mein.io> (cherry picked from commit b84791bd029c2aaa67cbc06a15d23828f62f4608)
-rw-r--r--applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js2
1 files changed, 1 insertions, 1 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 69b69be9b9..a019b2cc31 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
@@ -571,7 +571,7 @@ function renderDependencies(depends, info)
if (deps[i] === 'libc')
continue;
- if (deps[i].match(/^(.+)\s+\((<=|<|>|>=|=|<<|>>)(.+)\)$/)) {
+ if (deps[i].match(/^(.+)\s+\((<=|>=|<<|>>|<|>|=)(.+)\)$/)) {
dep = RegExp.$1.trim();
vop = RegExp.$2.trim();
ver = RegExp.$3.trim();