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

publish.publish trim mods after comma split #49634

Merged
merged 2 commits into from
Oct 4, 2018
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions salt/client/ssh/wrapper/state.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ def sls(mods, saltenv='base', test=None, exclude=None, **kwargs):
__context__['fileclient'])
st_.push_active()
if isinstance(mods, six.string_types):
mods = mods.split(',')
mods = [item.strip() for item in mods.split(',')]
bmiguel-teixeira marked this conversation as resolved.
Show resolved Hide resolved
high_data, errors = st_.render_highstate({saltenv: mods})
if exclude:
if isinstance(exclude, six.string_types):
Expand Down Expand Up @@ -923,7 +923,7 @@ def sls_id(id_, mods, test=None, queue=False, **kwargs):
return err

if isinstance(mods, six.string_types):
split_mods = mods.split(',')
split_mods = [item.strip() for item in mods.split(',')]
st_.push_active()
high_, errors = st_.render_highstate({opts['saltenv']: split_mods})
errors += st_.state.verify_high(high_)
Expand Down Expand Up @@ -981,7 +981,7 @@ def show_sls(mods, saltenv='base', test=None, **kwargs):
__context__['fileclient'])
st_.push_active()
if isinstance(mods, six.string_types):
mods = mods.split(',')
mods = [item.strip() for item in mods.split(',')]
bmiguel-teixeira marked this conversation as resolved.
Show resolved Hide resolved
high_data, errors = st_.render_highstate({saltenv: mods})
high_data, ext_errors = st_.state.reconcile_extend(high_data)
errors += ext_errors
Expand Down Expand Up @@ -1026,7 +1026,7 @@ def show_low_sls(mods, saltenv='base', test=None, **kwargs):
__context__['fileclient'])
st_.push_active()
if isinstance(mods, six.string_types):
mods = mods.split(',')
mods = [item.strip() for item in mods.split(',')]
high_data, errors = st_.render_highstate({saltenv: mods})
high_data, ext_errors = st_.state.reconcile_extend(high_data)
errors += ext_errors
Expand Down