lucene-solr:branch_5_5: LUCENE-7155: Script addVersion.py does not detect the new naming convention for bugfix branches (cherry picked from commit 6e446c0)

[ja...@apache.org]

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_5_5 7105d4517 -> 6568d2229


LUCENE-7155: Script addVersion.py does not detect the new naming convention for bugfix branches
(cherry picked from commit 6e446c0)


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/6568d222
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/6568d222
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/6568d222

Branch: refs/heads/branch_5_5
Commit: 6568d22294bc8105c3503a31b26decae805f83d2
Parents: 7105d45
Author: Jan Høydahl <ja...@apache.org>
Authored: Thu Mar 31 15:35:48 2016 +0200
Committer: Jan Høydahl <ja...@apache.org>
Committed: Thu Mar 31 15:36:47 2016 +0200

----------------------------------------------------------------------
 dev-tools/scripts/scriptutil.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6568d222/dev-tools/scripts/scriptutil.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/scriptutil.py b/dev-tools/scripts/scriptutil.py
index 6a3bcab..10efd2b 100644
--- a/dev-tools/scripts/scriptutil.py
+++ b/dev-tools/scripts/scriptutil.py
@@ -107,9 +107,9 @@ def find_branch_type():
 
   if branchName == b'master':
     return 'master'
-  if branchName.startswith(b'branch_'):
+  if re.match(r'branch_(\d+)x', branchName.decode('UTF-8')):
     return 'stable'
-  if branchName.startswith(b'lucene_solr_'):
+  if re.match(r'branch_(\d+)_(\d+)', branchName.decode('UTF-8')):
     return 'release'
   raise Exception('Cannot run bumpVersion.py on feature branch')