From aaeaa1dd9874775ff59e2e6b79bc37e82fa33397 Mon Sep 17 00:00:00 2001 From: Daniel Wagner-Hall Date: Wed, 9 Dec 2015 15:56:58 +0000 Subject: [PATCH] Detect major version in presence of patch release --- scripts/dump-swagger.py | 2 +- scripts/gendoc.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/dump-swagger.py b/scripts/dump-swagger.py index 75b46ac6..71acd052 100755 --- a/scripts/dump-swagger.py +++ b/scripts/dump-swagger.py @@ -26,7 +26,7 @@ output_directory = sys.argv[1] release_label = sys.argv[2] if len(sys.argv) > 2 else "unstable" major_version = release_label -match = re.match("^(r\d)+(\.\d+)?$", major_version) +match = re.match("^(r\d)+(\.\d+)*$", major_version) if match: major_version = match.group(1) diff --git a/scripts/gendoc.py b/scripts/gendoc.py index 801c06bb..88ca6bdb 100755 --- a/scripts/gendoc.py +++ b/scripts/gendoc.py @@ -429,7 +429,7 @@ def main(requested_target_name, keep_intermediates, substitutions): def extract_major(s): major_version = s - match = re.match("^(r\d)+(\.\d+)?$", s) + match = re.match("^(r\d)+(\.\d+)*$", s) if match: major_version = match.group(1) return major_version