saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #31133 from cachedout/fixup_31121

Browse source 
Fixup 31121
This commit is contained in:
Mike Place 2016-02-11 10:32:24 -07:00
commit e378afd891
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/modules/alternatives.py
View file

@ -92,7 +92,7 @@ def check_exists(name, path):
salt '*' alternatives.check_exists name path
'''
cmd = [_get_cmd(), '--list', name]
cmd = [_get_cmd(), '--display', name]
out = __salt__['cmd.run_all'](cmd, python_shell=False)
if out['retcode'] > 0 and out['stderr'] != '':

2
salt/states/alternatives.py
View file

@ -62,7 +62,7 @@ def install(name, link, path, priority):
'changes': {},
'comment': ''}
isinstalled = __salt__['alternatives.check_exists'](name, path)
isinstalled = __salt__['alternatives.check_installed'](name, path)
if not isinstalled:
if __opts__['test']:
ret['comment'] = (

2
tests/unit/states/alternatives_test.py
View file

@ -52,7 +52,7 @@ class AlternativesTestCase(TestCase):
mock = MagicMock(side_effect=[True, False, False])
mock_bool = MagicMock(return_value=True)
with patch.dict(alternatives.__salt__,
{'alternatives.check_exists': mock,
{'alternatives.check_installed': mock,
'alternatives.install': mock_bool}):
comt = ('Alternatives for {0} is already set to {1}'
).format(name, path)