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

Fix leftovers from sqlite-removal #3356

Merged
merged 1 commit into from
Dec 7, 2023
Merged

Fix leftovers from sqlite-removal #3356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGES/3351.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed bug about malformed tuple introduced on the removal of sqlite-metadata support (PR #3328).
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW, we sometimes mark issues like this as .misc, because as the bugs never made it to any users, it's not strictly relevant to the changelog.

But it's fine either way.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, ok.

2 changes: 1 addition & 1 deletion pulp_rpm/app/tasks/publishing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def prepare_metadata_files(self, content, folder=None):
path = os.path.join(folder, path)
with open(path, "wb") as new_file:
shutil.copyfileobj(current_file, new_file)
repomdrecords.append((repo_metadata_file.data_type, new_file.name, None))
repomdrecords.append((repo_metadata_file.data_type, new_file.name))

return repomdrecords

Expand Down
7 changes: 7 additions & 0 deletions pulp_rpm/tests/functional/api/test_publish.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
RPM_COMPLEX_FIXTURE_URL,
RPM_KICKSTART_FIXTURE_URL,
RPM_KICKSTART_REPOSITORY_ROOT_CONTENT,
RPM_REPO_METADATA_FIXTURE_URL,
RPM_LONG_UPDATEINFO_FIXTURE_URL,
RPM_MODULAR_FIXTURE_URL,
RPM_NAMESPACES,
Expand Down Expand Up @@ -151,6 +152,12 @@ def test_publish_rpm_long_updateinfo(assert_created_publication):
assert_created_publication(RPM_LONG_UPDATEINFO_FIXTURE_URL)


@pytest.mark.parallel
def test_publish_rpm_custom_metadata(assert_created_publication):
"""Sync and publish an RPM with custom metadata files."""
assert_created_publication(RPM_REPO_METADATA_FIXTURE_URL)


@pytest.mark.parallel
def test_publish_rpm_alt_layout(assert_created_publication):
"""Sync and publish an RPM alternate layout repository."""
Expand Down
Loading