Skip to content

cmd-diff: fix rpm diffing in a build-with-buildah world #4321

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

Merged
merged 1 commit into from
Sep 16, 2025
Merged

cmd-diff: fix rpm diffing in a build-with-buildah world #4321

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
8 changes: 4 additions & 4 deletions src/cmd-diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,9 @@ def diff_source_control(diff_from, diff_to):


def diff_rpms(diff_from, diff_to):
commit_from = diff_from.meta['ostree-commit']
commit_to = diff_to.meta['ostree-commit']
runcmd(['rpm-ostree', 'db', 'diff', '--repo', TMP_REPO, commit_from, commit_to])
ref_from = diff_from.id
ref_to = diff_to.id
runcmd(['rpm-ostree', 'db', 'diff', '--repo', TMP_REPO, ref_from, ref_to])


def diff_ostree_ls(diff_from, diff_to):
Expand Down Expand Up @@ -428,7 +428,7 @@ def cache_dir(dir):

# unfortunately, this has to come at the end to resolve functions
DIFFERS = [
Differ("rpms", "Diff RPMs", needs_ostree=OSTreeImport.PARTIAL, function=diff_rpms),
Differ("rpms", "Diff RPMs", needs_ostree=OSTreeImport.FULL, function=diff_rpms),
Differ("source-control", "Diff config and COSA input commits",
needs_ostree=OSTreeImport.NO, function=diff_source_control),
Differ("ostree-ls", "Diff OSTree contents using 'ostree diff'",
Expand Down
Loading