From: Jo-Philipp Wich <jo@mein.io>
Date: Sat, 28 Jan 2017 13:01:50 +0000 (+0100)
Subject: phase1: allow tag versions with rc designations
X-Git-Tag: v1~184
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d84f0f0b52587470f31aea51103cc4e6e82218ab;p=buildbot.git

phase1: allow tag versions with rc designations

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/phase1/master.cfg b/phase1/master.cfg
index 542c3c5..abb5501 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -194,7 +194,7 @@ def IsCleanRequested(pattern):
 
 def IsTaggingRequested(step):
 	val = step.getProperty("tag")
-	if val and re.match("^[0-9]+\.[0-9]+\.[0-9]+$", val):
+	if val and re.match("^[0-9]+\.[0-9]+\.[0-9]+(?:-rc[0-9]+)?$", val):
 		return True
 	else:
 		return False
@@ -213,7 +213,7 @@ def GetBaseVersion(props):
 
 def GetVersionPrefix(props):
 	basever = GetBaseVersion(props)
-	if props.hasProperty("tag") and re.match("^[0-9]+\.[0-9]+\.[0-9]+$", props["tag"]):
+	if props.hasProperty("tag") and re.match("^[0-9]+\.[0-9]+\.[0-9]+(?:-rc[0-9]+)?$", props["tag"]):
 		return "%s/" % props["tag"]
 	elif basever != "master":
 		return "%s-SNAPSHOT/" % basever