Check inside --root when querying for files #2582
Merged
Conversation
This file contains 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
dmnks
reviewed
Jul 26, 2023
lib/query.c
Outdated
| @@ -470,11 +470,13 @@ static rpmdbMatchIterator initQueryIterator(QVA_t qva, rpmts ts, const char * ar | |||
|
|
|||
| if (mi == NULL) { | |||
| struct stat sb; | |||
| if (lstat(fn, &sb) != 0) | |||
| char * full_fn = rpmGenPath(rpmtsRootDir(ts), fn, NULL); | |||
There was a problem hiding this comment.
How about using the simpler rpmGetPath() instead? The Gen variant only differs in that it also accepts URLs which I don't think we need here 😄
rpm -qf checks if the argument actually exists if it can't be found in the rpmdb and gives different messages based on that. This was done without taking the root dir into account leading to wrong messages if the file only exists in the root dir but not outside. Resolves: rpm-software-management#2576
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
rpm -qf checks if the argument actually exists if it can't be found in the rpmdb and gives different messages based on that.
This was done without taking the root dir into account leading to wrong messages if the file only exists in the root dir but not outside.
Resolves: #2576