@@ -6,7 +6,7 @@ Operations :members: :exclude-members: sudo, put, run, get - .. autofunction:: sudo(command, shell=True, user=None, pty=False) + .. autofunction:: get(remote_path, local_path) .. autofunction:: put(local_path, remote_path, mode=None) .. autofunction:: run(command, shell=True, pty=False) - .. autofunction:: get(remote_path, local_path) + .. autofunction:: sudo(command, shell=True, pty=False,user=None) docs/api/operations.rst @@ -389,17 +389,16 @@ def _shell_wrap(command, shell=True, sudo_prefix=None): """ Conditionally wrap given command in env.shell (while honoring sudo.) """ - # Do shell escaping here and only here. - command = _shell_escape(command) # Sudo plus space, or empty string if sudo_prefix is None: sudo_prefix = "" else: sudo_prefix += " " - # Shell plus space, or empty string; and command quoted or not. + # If we're shell wrapping, prefix shell and space, escape the command and + # then quote it. Otherwise, empty string. if shell: shell = env.shell + " " - command = '"%s"' % command + command = '"%s"' % _shell_escape(command) else: shell = "" # Resulting string should now have correct formatting @@ -520,8 +519,8 @@ def run(command, shell=True, pty=False): If ``shell`` is True (the default), `run` will execute the given command string via a shell interpreter, the value of which may be controlled by setting ``env.shell`` (defaulting to something similar to ``/bin/bash -l -c - "<command>"``.) Any double-quote (``"``) characters in ``command`` will be - automatically escaped when ``shell`` is True. + "<command>"``.) Any double-quote (``"``) or dollar-sign (``$``) characters + in ``command`` will be automatically escaped when ``shell`` is True. `run` will return the result of the remote program's stdout as a single (likely multiline) string. This string will exhibit a ``failed`` fabric/operations.py @@ -139,12 +139,23 @@ def test_shell_wrap(): del eq_.description -def test_shell_wrap_escapes_command(): +def test_shell_wrap_escapes_command_if_shell_is_true(): """ - _shell_wrap() escapes given command + _shell_wrap() escapes given command if shell=True """ cmd = "cd \"Application Support\"" - eq_(_shell_wrap(cmd, shell=False), _shell_escape(cmd)) + eq_( + _shell_wrap(cmd, shell=True), + '%s "%s"' % (env.shell, _shell_escape(cmd)) + ) + + +def test_shell_wrap_does_not_escape_command_if_shell_is_false(): + """ + _shell_wrap() does no escaping if shell=False + """ + cmd = "cd \"Application Support\"" + eq_(_shell_wrap(cmd, shell=False), cmd) def test_shell_escape_escapes_doublequotes(): tests/test_operations.py f6eac33fe8ab1e7e2ed10665a9c149ae93a9491a Jeff Forcier jeff@bitprophet.org http://github.com/karmazilla/fabric/commit/90fc395de3c9da2e6d670aa3b433da2bd683485a 90fc395de3c9da2e6d670aa3b433da2bd683485a 2009-09-17T09:10:35-07:00 2009-09-17T09:10:35-07:00 Fix escape logic so behavior == docstring. 71c15c79cf46ccdd44c26f3d6b86c8b1cda78979 Jeff Forcier jeff@bitprophet.org