From d84f0f0b52587470f31aea51103cc4e6e82218ab Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 28 Jan 2017 14:01:50 +0100 Subject: [PATCH] phase1: allow tag versions with rc designations Signed-off-by: Jo-Philipp Wich --- phase1/master.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- 2.30.2