From 549136b1b0d8cb71c72294b1dc1abc590fb1e8fc Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@gmail.com>
Date: Tue, 6 May 2025 12:49:31 +0200
Subject: [PATCH] tools: drop requirement for `module_platform_id` from request

The PLATFORM_ID got retired from fedora-43 [0] and it
seems like it was always kinda optional. So lets make
it optional for real to avoid failing to build fedora-43
images.

[0] https://fedoraproject.org/wiki/Changes/Drop_PLATFORM_ID
---
 osbuild/solver/dnf.py      | 5 +++--
 osbuild/solver/dnf5.py     | 5 +++--
 tools/osbuild-depsolve-dnf | 6 ------
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/osbuild/solver/dnf.py b/osbuild/solver/dnf.py
index d7e5b94b..5918e712 100755
--- a/osbuild/solver/dnf.py
+++ b/osbuild/solver/dnf.py
@@ -20,7 +20,7 @@ class DNF(SolverBase):
     def __init__(self, request, persistdir, cache_dir, license_index_path=None):
         arch = request["arch"]
         releasever = request.get("releasever")
-        module_platform_id = request["module_platform_id"]
+        module_platform_id = request.get("module_platform_id")
         proxy = request.get("proxy")
 
         arguments = request["arguments"]
@@ -51,7 +51,8 @@ class DNF(SolverBase):
         self.base.conf.zchunk = False
 
         # Set the rest of the dnf configuration.
-        self.base.conf.module_platform_id = module_platform_id
+        if module_platform_id:
+            self.base.conf.module_platform_id = module_platform_id
         self.base.conf.config_file_path = "/dev/null"
         self.base.conf.persistdir = persistdir
         self.base.conf.cachedir = cache_dir
diff --git a/osbuild/solver/dnf5.py b/osbuild/solver/dnf5.py
index a2c0f1cf..3a6ed401 100755
--- a/osbuild/solver/dnf5.py
+++ b/osbuild/solver/dnf5.py
@@ -59,7 +59,7 @@ class DNF5(SolverBase):
     def __init__(self, request, persistdir, cachedir, license_index_path=None):
         arch = request["arch"]
         releasever = request.get("releasever")
-        module_platform_id = request["module_platform_id"]
+        module_platform_id = request.get("module_platform_id")
         proxy = request.get("proxy")
 
         arguments = request["arguments"]
@@ -115,7 +115,8 @@ class DNF5(SolverBase):
         conf.zchunk = False
 
         # Set the rest of the dnf configuration.
-        conf.module_platform_id = module_platform_id
+        if module_platform_id:
+            conf.module_platform_id = module_platform_id
         conf.config_file_path = "/dev/null"
         conf.persistdir = persistdir
         conf.cachedir = cachedir
diff --git a/tools/osbuild-depsolve-dnf b/tools/osbuild-depsolve-dnf
index 186121aa..a38fc250 100755
--- a/tools/osbuild-depsolve-dnf
+++ b/tools/osbuild-depsolve-dnf
@@ -141,12 +141,6 @@ def validate_request(request):
             "reason": "no 'arch' specified"
         }
 
-    if not request.get("module_platform_id"):
-        return {
-            "kind": "InvalidRequest",
-            "reason": "no 'module_platform_id' specified"
-        }
-
     if not request.get("releasever"):
         return {
             "kind": "InvalidRequest",