Fix bug re: env.use_shell no longer being honored.

Thanks to Ralf Schmitt for the catch.
carljm · Dec 13, 2009 · 31788f7 · 31788f7
1 parent a1f84c5
commit 31788f7
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/fabric/operations.py b/fabric/operations.py
@@ -391,6 +391,10 @@ def _shell_wrap(command, shell=True, sudo_prefix=None):
     """
     Conditionally wrap given command in env.shell (while honoring sudo.)
     """
+    # Honor env.shell, while allowing the 'shell' kwarg to override it (at
+    # least in terms of turning it off.)
+    if shell and not env.use_shell:
+        shell = False
     # Sudo plus space, or empty string
     if sudo_prefix is None:
         sudo_prefix = ""