From: Chuanhong Guo Date: Sat, 21 May 2016 08:14:31 +0000 (+0300) Subject: luci-base: Turn off pattern matching when generating distversion X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=a64448b16bcb741bf872409b3d051035a28dd3f8 luci-base: Turn off pattern matching when generating distversion Otherwize the distrevision may be displayed twice if it contains some special matching patterns. (For example I am using "git-$hash" in my own OpenWrt branch.) Signed-off-by: Chuanhong Guo (cherry picked from commit c1f0a9971a0b75515996cd59dfaf70f3ff6cc624) --- diff --git a/modules/luci-base/src/mkversion.sh b/modules/luci-base/src/mkversion.sh index e3ef97448..e2d02c1c7 100755 --- a/modules/luci-base/src/mkversion.sh +++ b/modules/luci-base/src/mkversion.sh @@ -10,7 +10,7 @@ if pcall(dofile, "/etc/openwrt_release") and _G.DISTRIB_DESCRIPTION then distversion = _G.DISTRIB_DESCRIPTION if _G.DISTRIB_REVISION then distrevision = _G.DISTRIB_REVISION - if not distversion:find(distrevision) then + if not distversion:find(distrevision,1,true) then distversion = distversion .. " " .. distrevision end end