Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't remove one directory level from slspath (master branch) #55434

Merged
merged 3 commits into from Jan 5, 2020

Conversation

terminalmage
Copy link
Collaborator

@terminalmage terminalmage commented Nov 25, 2019

This is the same fix as #55433, opened against the master branch.

This breaks the tpldir jinja context variable for the cases where there
is an SLS path in the format `X.X` (e.g. `foo.foo`, `bar.bar`, etc.).

It also conflicts with the stated documentation for this parameter in
`doc/rev/states/vars.rst`, which states that this variable should be the
path to the SLS target. In reality this is passed in via
`context['sls']` and already has the correct path.

If I were to wager a guess, I would say that it's likely that the way
`context['sls']` is formulated has changed at some point since these two
lines were added in 2014, making these two lines unnecessary.
@terminalmage terminalmage requested a review from as a code owner Nov 25, 2019
@ghost ghost requested a review from dwoz Nov 25, 2019
@Akm0d Akm0d added this to the Approved milestone Nov 26, 2019
@Akm0d Akm0d added this to PR needs merge to master in PRs to port to master via automation Nov 26, 2019
@dwoz
Copy link
Contributor

@dwoz dwoz commented Jan 4, 2020

re-run full centos

dwoz
dwoz approved these changes Jan 5, 2020
@dwoz dwoz merged commit 5a17dd6 into saltstack:master Jan 5, 2020
49 checks passed
PRs to port to master automation moved this from PR needs merge to master to PR merged Jan 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.

None yet

3 participants