jenkins-bot has submitted this change and it was merged.
Change subject: Support wmf branches like '1.23.0-wmf.6'
......................................................................
Support wmf branches like '1.23.0-wmf.6'
Bug: T107192
Change-Id: Idae260e43d9246a2698875696067efad18e4ef5a
---
M utils.py
1 file changed, 15 insertions(+), 1 deletion(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/utils.py b/utils.py
index c644cda..cf455e6 100644
--- a/utils.py
+++ b/utils.py
@@ -1,5 +1,9 @@
def wmf_number(branchname):
"""
+ >>> wmf_number('1.27.0-wmf21')
+ 12721
+ >>> wmf_number('1.27.0-wmf1')
+ 12701
>>> wmf_number('1.26wmf10')
12610
>>> wmf_number('1.25wmf8')
@@ -8,13 +12,22 @@
False
>>> wmf_number('phase0')
False
+ >>> wmf_number('1.27.2-wmf1') # only doing -wmf for .0
+ False
"""
-
try:
major, minor = branchname.split('wmf', 1)
except ValueError:
return False
+
major = major.replace('.', '')
+ major = major.replace('-', '')
+ if len(major) == 4:
+ if major[-1] != '0':
+ return False
+ major = major[:-1]
+
+ minor = minor.replace('.', '')
try:
int(minor)
except ValueError:
@@ -23,3 +36,4 @@
minor = '0' + minor
return int(major + minor)
+
--
To view, visit https://gerrit.wikimedia.org/r/238542
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idae260e43d9246a2698875696067efad18e4ef5a
Gerrit-PatchSet: 6
Gerrit-Project: labs/tools/forrestbot
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: 20after4 <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
