Detect major version in presence of patch release

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)
 

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