Pass arg2 to file trigger scripts #2883
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
No functional change, just laying the groundwork for the next commit.
Pass the number of instances of the target (i.e. triggering) package left after the operation as the second argument ($2) to file trigger scripts, similarly to regular triggers. Don't pass it to the %transfiletrigger* variants, though, since we can't easily obtain a count-corrected value when such a file trigger is fired by a transaction element. This is because when runFileTriggers() is called in rpmtsRun(), no psm instance has been created yet and thus psm->scriptArg, set by rpmpsmNew(), isn't readily available to us in runHandleTriggersInPkg(). While possible to work around, having arg2 in transaction file triggers doesn't seem worth the trouble. Make arg2 correspond to the first matching package found, as opposed to being an aggregate count of all the matching packages, even if the latter would be easier as we wouldn't have to store the matched package name in the mfi struct and just use rpmdbGetIteratorCount(mfi->pi). The reason for this is two-fold: it's consistent with how regular triggers work and it allows file triggers to detect an upgrade (arg2 > 1) of a triggering package. Fixes: rpm-software-management#2755
|
Aside from those three-way indiretions making me cringe a bit (not that it makes any difference here), looks pretty straight-forward to me. This is one where feedback from active packagers would be useful. |
Good point! I've brought it to the related discussion thread, let's see if we get some feedback. |
|
After mulling on it for a few days, I don't know what else we should do with this really. And, it doesn't seem to be pulling a whole lot of attention either. Let's just merge. |
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.
This is the other half of #2755 adding the second argument to file trigger scripts.