From 8c249f3dc3f655b5bb6e62aab940c608fe661e1a Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Aug 30 2022 23:20:17 +0000
Subject: critpath.py: Let argparse handle the 'release' argument


There's no need to do it ourselves.

Signed-off-by: Adam Williamson <awilliam@redhat.com>

---

diff --git a/scripts/critpath.py b/scripts/critpath.py
index 1edef2d..aa0c614 100755
--- a/scripts/critpath.py
+++ b/scripts/critpath.py
@@ -110,8 +110,10 @@ def expand_dnf_critpath(url, arch):
 
 def parse_args():
     releases = sorted(RELEASEPATH.keys())
-    parser = argparse.ArgumentParser(usage = "%%(prog)s [options] [%s]" % '|'.join(releases))
+    parser = argparse.ArgumentParser()
     mexcgroup = parser.add_mutually_exclusive_group()
+    parser.add_argument("release", choices=releases,
+                      help="The release to work on (a release number, 'branched', or 'rawhide')")
     mexcgroup.add_argument("--nvr", action='store_true', default=False,
                       help="output full NVR instead of just package name")
     mexcgroup.add_argument("--srpm", action='store_true', default=False,
@@ -131,17 +133,11 @@ def parse_args():
     parser.add_argument("--noaltarch", action='store_true', default=False,
                       help="Not to run for alternate architectures")
     (args, extras) = parser.parse_known_args()
-
-    # Input & Sanity Validation
-    if (len(extras) != 1) or (extras[0] not in releases):
-        parser.error(f"must choose a release from the list: {releases}")
-
-    # Parse values
-    release = extras[0]
-    return(args, release)
+    return(args)
 
 def main():
-    (args, release) = parse_args()
+    args = parse_args()
+    release = args.release
     check_arches = args.arches.split(',')
     if not (release.isdigit() and int(release) < 37):
         # armhfp is gone on F37+