Fix for UBI10 RPMDB location#2183
Merged
MartinBasti merged 1 commit intocontainerbuildsystem:masterfrom Apr 23, 2026
Merged
Conversation
MartinBasti
reviewed
Apr 22, 2026
| else: | ||
| self.log.info("image doesn't contain or has empty rpmdb %s", rpmdb_origin) | ||
| else: | ||
| self.log.info("found rpmdb %s" % rpmdb_origin) |
Contributor
There was a problem hiding this comment.
Suggested change
| self.log.info("found rpmdb %s" % rpmdb_origin) | |
| self.log.info("found rpmdb %s", rpmdb_origin) |
Contributor
|
also Flake8 should be improved, ignore mypy and tekton linters |
MartinBasti
reviewed
Apr 22, 2026
| except NothingExtractedError: | ||
| if self.workflow.data.dockerfile_images.base_from_scratch: | ||
| self.log.info("scratch image doesn't contain or has empty rpmdb %s", rpmdb_origin) | ||
| self.log.info(f"scratch image doesn't contain rpmdb at {rpmdb_origin}") |
Contributor
There was a problem hiding this comment.
f-strings shouldn't be used in logger. To prevent unneeded string interpolation, use log.info("text %s", var, ...)
Contributor
|
Please squash those fixup commits into one commit |
Updates the rpmqa plugin such that it searches both the original /var/lib/rpm location, and if that fails attempts a fallback list of dirs, currently just /usr/lib/sysimage/rpm If nothing is found, it still raises a NothingExtractedError as before, unless it is a base_from_scratch image in which case it preserves original behavior and returns an empty list Mimics expected specific error and log messages Signed-off-by: Christopher O'Brien <cobrien@redhat.com>
MartinBasti
approved these changes
Apr 22, 2026
mkosiarc
approved these changes
Apr 23, 2026
MartinBasti
merged commit f6b1ea4
into
containerbuildsystem:master
13 of 15 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Updates the rpmqa plugin such that it searches both the original /var/lib/rpm location, and if that fails attempts a fallback list of dirs, currently just /usr/lib/sysimage/rpm
If nothing is found, it still raises a NothingExtractedError as before, unless it is a base_from_scratch image in which case it preserves original behavior and returns an empty list
Maintainers will complete the following section