luci-base:Turn off pattern matching when generating distversion 723/head
authorChuanhong Guo <gch981213@gmail.com>
Sat, 14 May 2016 03:46:28 +0000 (11:46 +0800)
committerChuanhong Guo <gch981213@gmail.com>
Sat, 14 May 2016 03:46:28 +0000 (11:46 +0800)
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 <gch981213@gmail.com>
modules/luci-base/src/mkversion.sh

index e3ef974482180855c6d30e9ea845d74be8324a44..e2d02c1c741396c8eef3093974f1a637c03b161c 100755 (executable)
@@ -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