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

explicitly quote requirements filename

Browse source
This commit is contained in:
Justin Findlay 2015-05-04 00:39:34 -06:00
parent 29a023aaad
commit 11d893db19
3 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/modules/pip.py
View file

@ -83,6 +83,7 @@ import shutil
# Import salt libs
import salt.utils
import salt.utils.locales
import salt.utils.url
from salt.ext.six import string_types
from salt.exceptions import CommandExecutionError, CommandNotFoundError
@ -210,7 +211,7 @@ def _process_requirements(requirements, cmd, saltenv, user, no_chown):
)
__salt__['file.chown'](treq, user, None)
cleanup_requirements.append(treq)
cmd.append('--requirement={0!r}'.format(treq or requirement))
cmd.append('--requirement="{0}"'.format(treq or requirement))
return cleanup_requirements, None

2
salt/states/pip_state.py
View file

@ -737,7 +737,7 @@ def installed(name,
comments = []
if requirements:
comments.append('Unable to process requirements file '
'{0}.'.format(requirements))
'"{0}".'.format(requirements))
if editable:
comments.append('Unable to install from VCS checkout'
'{0}.'.format(editable))

24
tests/unit/modules/pip_test.py
View file

@ -23,7 +23,7 @@ class PipTestCase(TestCase):
mock = MagicMock(return_value={'retcode': 0, 'stdout': ''})
with patch.dict(pip.__salt__, {'cmd.run_all': mock}):
pip.install(requirements='requirements.txt')
expected_cmd = 'pip install --requirement=\'requirements.txt\''
expected_cmd = 'pip install --requirement="requirements.txt"'
mock.assert_called_once_with(
expected_cmd,
saltenv='base',
@ -301,7 +301,7 @@ class PipTestCase(TestCase):
mock = MagicMock(return_value={'retcode': 0, 'stdout': ''})
with patch.dict(pip.__salt__, {'cmd.run_all': mock}):
pip.install(requirements='salt://requirements.txt')
expected_cmd = 'pip install --requirement=\'my_cached_reqs\''
expected_cmd = 'pip install --requirement="my_cached_reqs"'
mock.assert_called_once_with(
expected_cmd,
saltenv='base',
@ -729,8 +729,8 @@ class PipTestCase(TestCase):
pip.install(requirements=requirements)
mock.assert_called_once_with(
'pip install '
'--requirement=\'my_cached_reqs-1\' '
'--requirement=\'my_cached_reqs-2\'',
'--requirement="my_cached_reqs-1" '
'--requirement="my_cached_reqs-2"',
saltenv='base',
runas=None,
cwd=None,
@ -747,8 +747,8 @@ class PipTestCase(TestCase):
pip.install(requirements=','.join(requirements))
mock.assert_called_once_with(
'pip install '
'--requirement=\'my_cached_reqs-1\' '
'--requirement=\'my_cached_reqs-2\'',
'--requirement="my_cached_reqs-1" '
'--requirement="my_cached_reqs-2"',
saltenv='base',
runas=None,
cwd=None,
@ -762,7 +762,7 @@ class PipTestCase(TestCase):
with patch.dict(pip.__salt__, {'cmd.run_all': mock}):
pip.install(requirements=requirements[0])
mock.assert_called_once_with(
'pip install --requirement=\'my_cached_reqs-1\'',
'pip install --requirement="my_cached_reqs-1"',
saltenv='base',
runas=None,
cwd=None,
@ -785,8 +785,8 @@ class PipTestCase(TestCase):
pip.uninstall(requirements=requirements)
mock.assert_called_once_with(
'pip uninstall -y '
'--requirement=\'my_cached_reqs-1\' '
'--requirement=\'my_cached_reqs-2\'',
'--requirement="my_cached_reqs-1" '
'--requirement="my_cached_reqs-2"',
saltenv='base',
runas=None,
cwd=None,
@ -803,8 +803,8 @@ class PipTestCase(TestCase):
pip.uninstall(requirements=','.join(requirements))
mock.assert_called_once_with(
'pip uninstall -y '
'--requirement=\'my_cached_reqs-1\' '
'--requirement=\'my_cached_reqs-2\'',
'--requirement="my_cached_reqs-1" '
'--requirement="my_cached_reqs-2"',
saltenv='base',
runas=None,
cwd=None,
@ -818,7 +818,7 @@ class PipTestCase(TestCase):
with patch.dict(pip.__salt__, {'cmd.run_all': mock}):
pip.uninstall(requirements=requirements[0])
mock.assert_called_once_with(
'pip uninstall -y --requirement=\'my_cached_reqs-1\'',
'pip uninstall -y --requirement="my_cached_reqs-1"',
saltenv='base',
runas=None,
cwd=None,