summaryrefslogtreecommitdiff
path: root/hacking
diff options
context:
space:
mode:
authorRick Elrod <rick@elrod.me>2020-07-30 21:28:43 -0500
committerGitHub <noreply@github.com>2020-07-30 21:28:43 -0500
commit75e8da09501dd9de565cb7854205b8e06615565f (patch)
tree08eaf5a35742f46c6a6801b8b71ecfbd4de2a875 /hacking
parentf99f96ceb63fd2251f4286a2da2e10a9031d241e (diff)
downloadansible-75e8da09501dd9de565cb7854205b8e06615565f.tar.gz
hacking: fix announce script version parsing (#71008)
Change: - Fix a bug where rc/beta versions throw off the "is this an ansible-base release"? check. Test Plan: - Used it for 2.10.0rc4 Signed-off-by: Rick Elrod <rick@elrod.me>
Diffstat (limited to 'hacking')
-rw-r--r--hacking/build_library/build_ansible/announce.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/hacking/build_library/build_ansible/announce.py b/hacking/build_library/build_ansible/announce.py
index de993a0f45..c245bfb97b 100644
--- a/hacking/build_library/build_ansible/announce.py
+++ b/hacking/build_library/build_ansible/announce.py
@@ -235,8 +235,11 @@ def is_ansible_base(version):
ver_split = []
for component in version.split('.'):
if not component.isdigit():
- # Take everything up until the first non-numeric component
- break
+ if 'rc' in component:
+ ver_split.append(int(component.split('rc')[0]))
+ if 'b' in component:
+ ver_split.append(int(component.split('b')[0]))
+ continue
ver_split.append(int(component))
return tuple(ver_split) >= (2, 10, 0)