From 4c0059e91b3a0a93002dbd0d26409274c9531f76 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 18 Jan 2024 10:35:23 -0800 Subject: [PATCH] checks: don't require "repo" in the "ostree" schema Per @siosm in https://pagure.io/pungi-fedora/pull-request/1227 this option "is deprecated and not needed anymore", so Pungi should not be requiring it. Merges: https://pagure.io/pungi/pull-request/1714 Signed-off-by: Adam Williamson (cherry picked from commit 432b0bce0401c4bbcd1a958a89305c475a794f26) --- pungi/checks.py | 1 - pungi/phases/ostree.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pungi/checks.py b/pungi/checks.py index 0de3ef57..f966f403 100644 --- a/pungi/checks.py +++ b/pungi/checks.py @@ -1079,7 +1079,6 @@ def make_schema(): "required": [ "treefile", "config_url", - "repo", "ostree_repo", ], "additionalProperties": False, diff --git a/pungi/phases/ostree.py b/pungi/phases/ostree.py index 90578ae5..2649cdbf 100644 --- a/pungi/phases/ostree.py +++ b/pungi/phases/ostree.py @@ -85,7 +85,7 @@ class OSTreeThread(WorkerThread): comps_repo = compose.paths.work.comps_repo( "$basearch", variant=variant, create_dir=False ) - repos = shortcuts.force_list(config["repo"]) + self.repos + repos = shortcuts.force_list(config.get("repo", [])) + self.repos if compose.has_comps: repos.append(translate_path(compose, comps_repo)) repos = get_repo_dicts(repos, logger=self.pool)