mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 09:23:56 +00:00
8b16300495
These didn't get caught in PR 42823 because of how we invoke the git_pillar code. Firstly, the "pillar" argument needed to stay. This is because even though we're not using it, _external_pillar_data() is still passing it now that git_pillar is not specially invoked there. Secondly, since the input comes in as a list, and _external_pillar_data uses single-asterisk expansion, the repos are passed separately when they should be passed as a single list. To fix these issues, I've done the following: 1. Re-introduced the "pillar" argument in git_pillar's ext_pillar function. 2. Changed the "pillar" variable to avoid confusion with the (unused) "pillar" argument being passed in. 3. Instead of git_pillar accepting the repos as a list, the ext_pillar function now uses single-asterisk expansion to make it conform with how _external_pillar_data() invokes it. |
||
---|---|---|
.. | ||
ext | ||
parser | ||
__init__.py | ||
case.py | ||
cherrypy_testclasses.py | ||
cptestcase.py | ||
gitfs.py | ||
helpers.py | ||
mixins.py | ||
mock.py | ||
paths.py | ||
processes.py | ||
runtests.py | ||
unit.py | ||
xmlunit.py |