42 lines
1.6 KiB
Diff
42 lines
1.6 KiB
Diff
|
From 432b0bce0401c4bbcd1a958a89305c475a794f26 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Adam Williamson <awilliam@redhat.com>
|
||
|
|
Date: Jan 19 2024 07:25:09 +0000
|
||
|
|
Subject: 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 <awilliam@redhat.com>
|
||
|
|
|
||
|
|
---
|
||
|
|
|
||
|
|
diff --git a/pungi/checks.py b/pungi/checks.py
|
||
|
|
index a340f93..db8b297 100644
|
||
|
|
--- a/pungi/checks.py
|
||
|
|
+++ b/pungi/checks.py
|
||
|
|
@@ -1066,7 +1066,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 90578ae..2649cdb 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)
|
||
|
|
|