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 #55433

Closed
wants to merge 516 commits into from

Conversation

dwoz
Copy link
Contributor

@dwoz dwoz commented Nov 25, 2019

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.

What does this PR do?

What issues does this PR fix or reference?

Previous Behavior

Remove this section if not relevant

New Behavior

Remove this section if not relevant

Tests written?

[NOTICE] Bug fixes or features added to Salt require tests.
Please review the test documentation for details on how to implement tests into Salt's test suite.

Yes/No

Commits signed with GPG?

Yes/No

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

s0undt3ch and others added 30 commits October 30, 2019 21:31
Try to use the same version matching python binary
…en_image_update

update to master branch of golden images for debian 10
dwoz and others added 21 commits December 1, 2019 13:51
…ged-11

[PyTest #11] Salt's test suite should not worry about coverage anymore.
…ged-12

[PyTest #12] Test scenario only manifests itself with the ZMQ transport
…ng_on_ipv6

fix network ping test on windows with ipv6
…with_xz

compress docs with xz to save more space
Lint fixes to master & Lint pre-commit hook fixes
doc: escape special characters on linux for cmd.run
Adds the possibility to also use downloadonly in kwargs
@dwoz dwoz added the v2019.2.3 unsupported version label Dec 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
v2019.2.3 unsupported version
Projects
None yet
Development

Successfully merging this pull request may close these issues.