luci-base: Turn off pattern matching when generating distversion
authorChuanhong Guo <gch981213@gmail.com>
Sat, 21 May 2016 08:14:31 +0000 (11:14 +0300)
committerHannu Nyman <hannu.nyman@iki.fi>
Sat, 21 May 2016 08:14:41 +0000 (11:14 +0300)
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>
(cherry picked from commit c1f0a9971a0b75515996cd59dfaf70f3ff6cc624)

modules/luci-base/src/mkversion.sh

index e3ef974..e2d02c1 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