[master] fix passing wrong keyword arguments to cp.cache_file in pkg.installed with sources #64110
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.
What does this PR do?
In salt 3006 I started getting
TypeError: salt.loaded.int.module.cp.cache_file() got multiple values for keyword argument 'saltenv'
errors in pkg.installed states.I tracked it down to commit 88b2dd1 which modified pkg.py by passing all kwargs to
cp.cache_file
, resulting in duplicatedsaltenv
and other invalid keyword arguments.Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes