From: Hannu Nyman <hannu.nyman@iki.fi>
Date: Sat, 14 May 2016 07:37:07 +0000 (+0300)
Subject: Merge pull request #723 from 981213/pr_disable_pattern
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=6415c04d1342162bad16874653189b3780cdbd04;hp=b213573682460dd395878c7369aba173f00bbb99

Merge pull request #723 from 981213/pr_disable_pattern

luci-base:Turn off pattern matching when generating distversion
---

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