From 3702e3f93946f9f03840575e35b45eee899f2438 Mon Sep 17 00:00:00 2001 From: Daniel Mach Date: Fri, 28 Jun 2024 09:52:06 +0200 Subject: [PATCH 1/2] Fix return value in build build.create_build_descr_data() --- osc/build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osc/build.py b/osc/build.py index b0df9af1..40d2e376 100644 --- a/osc/build.py +++ b/osc/build.py @@ -732,7 +732,7 @@ def create_build_descr_data( result_data.append((b"_service", f.read())) if not result_data and not prefer_pkgs: - return None, None + return None, {} cpio_data = cpio.CpioWrite() for key, value in result_data: From dcab9d5178de4c1e4769ea484eff08a6d914b89e Mon Sep 17 00:00:00 2001 From: Daniel Mach Date: Fri, 28 Jun 2024 09:53:16 +0200 Subject: [PATCH 2/2] Make obs_api.KeyinfoSslcert keyid and fingerprint fields optional --- osc/obs_api/keyinfo_sslcert.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osc/obs_api/keyinfo_sslcert.py b/osc/obs_api/keyinfo_sslcert.py index 8101056c..cfbf2fba 100644 --- a/osc/obs_api/keyinfo_sslcert.py +++ b/osc/obs_api/keyinfo_sslcert.py @@ -4,7 +4,7 @@ from ..util.models import * # pylint: disable=wildcard-import,unused-wildcard-i class KeyinfoSslcert(XmlModel): XML_TAG = "sslcert" - keyid: str = Field( + keyid: Optional[str] = Field( xml_attribute=True, ) @@ -36,7 +36,7 @@ class KeyinfoSslcert(XmlModel): xml_attribute=True, ) - fingerprint: str = Field( + fingerprint: Optional[str] = Field( xml_attribute=True, )