diff --git a/samples/base-from-yum.json b/samples/base-from-yum.json index 1b0fe52f..3698e77c 100644 --- a/samples/base-from-yum.json +++ b/samples/base-from-yum.json @@ -6,12 +6,12 @@ "options": { "releasever": "27", "basearch": "x86_64", - "repos": { - "fedora": { + "repos": [ + { "baseurl": "https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/$releasever/Everything/$basearch/os/", "gpgkey": "860E 19B0 AFA8 00A1 7518 81A6 F55E 7430 F528 2EE4" } - }, + ], "packages": [ "dnf", "systemd", diff --git a/samples/build-from-yum.json b/samples/build-from-yum.json index 2e01cc4f..235c81da 100644 --- a/samples/build-from-yum.json +++ b/samples/build-from-yum.json @@ -5,12 +5,12 @@ "options": { "releasever": "27", "basearch": "x86_64", - "repos": { - "fedora": { + "repos": [ + { "baseurl": "https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/$releasever/Everything/$basearch/os/", "gpgkey": "860E 19B0 AFA8 00A1 7518 81A6 F55E 7430 F528 2EE4" } - }, + ], "packages": [ "dnf", "systemd", diff --git a/stages/org.osbuild.yum b/stages/org.osbuild.yum index b5b64ae7..27d29fff 100755 --- a/stages/org.osbuild.yum +++ b/stages/org.osbuild.yum @@ -35,8 +35,8 @@ def main(tree, options): verbosity = options.get("verbosity", "info") with open("/tmp/yum.conf", "w") as conf: - for repoid, repo in repos.items(): - write_repofile(conf, repoid, repo) + for repoid, repo in enumerate(repos): + write_repofile(conf, f"repo{repoid}", repo) script = f""" set -e