ubuntu-build: make the --arch option top-level

This gets rid of the fugly --arch2 option
This commit is contained in:
Steve Langasek 2024-03-08 18:53:16 -08:00
parent 42f8e5c0d2
commit f01502bda2

View File

@ -65,12 +65,7 @@ def main():
# Prepare our option parser. # Prepare our option parser.
parser = argparse.ArgumentParser(usage=usage) parser = argparse.ArgumentParser(usage=usage)
# Retry options parser.add_argument(
retry_rescore_options = parser.add_argument_group(
"Retry and rescore options",
"These options may only be used with the 'retry' and 'rescore' operations.",
)
retry_rescore_options.add_argument(
"-a", "-a",
"--arch", "--arch",
action="append", action="append",
@ -105,13 +100,6 @@ def main():
type=int, type=int,
help="Rescore builds to <priority>.", help="Rescore builds to <priority>.",
) )
batch_options.add_argument(
"--arch2",
action="append",
dest="architecture",
help=f"Affect only 'architecture' (can be used several times)."
f" Valid architectures are: {', '.join(valid_archs)}.",
)
parser.add_argument("packages", metavar="package", nargs="*", help=argparse.SUPPRESS) parser.add_argument("packages", metavar="package", nargs="*", help=argparse.SUPPRESS)
# Parse our options. # Parse our options.