particle-os/debian-koji-osbuild
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

builder: make repo a proper optional argument

Browse source 
When the builder is used as an command line binary: have `repo`
be a proper command line argument. It was currently specified
before arch which can be passed multiple times, but so does
repo; hence one of them needs to be optional.
This commit is contained in:
Christian Kellner 2022-01-25 17:34:37 +00:00
parent 9c5f38fc35
commit 2ca0f3b370
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/builder/osbuild.py
View file

@ -551,10 +551,10 @@ def main():
subpar.add_argument("version", metavar="VERSION", help='The version') subpar.add_argument("version", metavar="VERSION", help='The version')
subpar.add_argument("release", metavar="RELEASE", help='The release') subpar.add_argument("release", metavar="RELEASE", help='The release')
subpar.add_argument("distro", metavar="DISTRO", help='The distribution') subpar.add_argument("distro", metavar="DISTRO", help='The distribution')
subpar.add_argument("repo", metavar="REPO", help='The repository to use',
type=str, action="append", default=[])
subpar.add_argument("arch", metavar="ARCHITECTURE", help='Request the architecture', subpar.add_argument("arch", metavar="ARCHITECTURE", help='Request the architecture',
type=str, nargs="+") type=str, nargs="+")
subpar.add_argument("--repo", metavar="REPO", help='The repository to use',
type=str, action="append", default=[])
subpar.add_argument("--format", metavar="FORMAT", help='Request the image format [qcow2]', subpar.add_argument("--format", metavar="FORMAT", help='Request the image format [qcow2]',
action="append", type=str, default=[]) action="append", type=str, default=[])
subpar.add_argument("--koji", metavar="URL", help='The koji url', subpar.add_argument("--koji", metavar="URL", help='The koji url',

2
test/unit/test_builder.py
View file

@ -645,8 +645,8 @@ class TestBuilderPlugin(PluginTest):
"33", "33",
"20201015.0", "20201015.0",
"fedora-33", "fedora-33",
"http://download.localhost/pub/linux/$arch",
"x86_64", "x86_64",
"--repo", "http://download.localhost/pub/linux/$arch",
"--cert", ", ".join(certs), "--cert", ", ".join(certs),
"--ca", "test/data/example-ca.pem" "--ca", "test/data/example-ca.pem"
] ]