From 2e536228aed0b542c039d88c05f7eb94dafa07c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
Date: Fri, 19 Jan 2024 08:39:33 +0100
Subject: [PATCH] Backport: Stop requiring repo option in ostree phase

(cherry picked from commit 6778cae05afb2b5784a46ed72ee2703785756dde)
---
 1715.patch | 41 +++++++++++++++++++++++++++++++++++++++++
 pungi.spec |  6 +++++-
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 1715.patch

diff --git a/1715.patch b/1715.patch
new file mode 100644
index 00000000..cc46aedc
--- /dev/null
+++ b/1715.patch
@@ -0,0 +1,41 @@
+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)
+
diff --git a/pungi.spec b/pungi.spec
index eb2f9fa1..d8effd87 100644
--- a/pungi.spec
+++ b/pungi.spec
@@ -2,13 +2,14 @@
 
 Name:           pungi
 Version:        4.6.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Distribution compose tool
 
 License:        GPL-2.0-only
 URL:            https://pagure.io/pungi
 Source0:        %{name}-%{version}.tar.bz2
 Patch1:         https://pagure.io/pungi/pull-request/1711.patch
+Patch2:         https://pagure.io/pungi/pull-request/1715.patch
 
 BuildRequires:  make
 BuildRequires:  python3-pytest
@@ -166,6 +167,9 @@ rm %{buildroot}%{_bindir}/pungi
 %{_bindir}/%{name}-cache-cleanup
 
 %changelog
+* Fri Jan 19 2024 Lubomír Sedlář <lsedlar@redhat.com> - 4.6.0-3
+- Stop requiring repo option in ostree phase
+
 * Thu Jan 18 2024 Lubomír Sedlář <lsedlar@redhat.com> - 4.6.0-2
 - ostree_container: Use unique temporary directory