Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix PMBS build failures #1589

Merged
merged 2 commits into from
Jun 28, 2024
Merged

Fix PMBS build failures #1589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3702e3f
Fix return value in build build.create_build_descr_data()
dmach Jun 28, 2024
dcab9d5
Make obs_api.KeyinfoSslcert keyid and fingerprint fields optional
dmach Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion osc/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,7 @@
result_data.append((b"_service", f.read()))

if not result_data and not prefer_pkgs:
return None, None
return None, {}

Check warning on line 735 in osc/build.py

View check run for this annotation

Codecov / codecov/patch

osc/build.py#L735 

Added line #L735 was not covered by tests

cpio_data = cpio.CpioWrite()
for key, value in result_data:
Expand Down
4 changes: 2 additions & 2 deletions osc/obs_api/keyinfo_sslcert.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
class KeyinfoSslcert(XmlModel):
XML_TAG = "sslcert"

keyid: str = Field(
keyid: Optional[str] = Field(

Check warning on line 7 in osc/obs_api/keyinfo_sslcert.py

View check run for this annotation

Codecov / codecov/patch

osc/obs_api/keyinfo_sslcert.py#L7 

Added line #L7 was not covered by tests
xml_attribute=True,
)

Expand Down Expand Up @@ -36,7 +36,7 @@
xml_attribute=True,
)

fingerprint: str = Field(
fingerprint: Optional[str] = Field(

Check warning on line 39 in osc/obs_api/keyinfo_sslcert.py

View check run for this annotation

Codecov / codecov/patch

osc/obs_api/keyinfo_sslcert.py#L39 

Added line #L39 was not covered by tests
xml_attribute=True,
)

Expand Down
Loading