Fix quoting of command when sudo is used on native client. Resolves #112

Author: Pan

Changelog.rst

@@ -1,6 +1,14 @@
 Change Log
 ============
 
+1.5.5
+++++++
+
+Fixes
+------
+
+* Use of ``sudo`` in native client incorrectly required escaping of command.
+
 1.5.4
 ++++++
 

pssh/ssh2_client.py

@@ -364,10 +364,8 @@ def run_command(self, command, sudo=False, user=None,
                 _command = 'sudo -S '
             elif user:
                 _command = 'sudo -u %s -S ' % (user,)
-            if shell:
-                _command += '%s "%s"' % (shell, command,)
-            else:
-                _command += '$SHELL -c "%s"' % (command,)
+            _shell = shell if shell else '$SHELL -c'
+            _command += "%s '%s'" % (_shell, command,)
         channel = self.execute(_command, use_pty=use_pty)
         return channel, self.host, \
             self.read_output_buffer(

tests/test_pssh_ssh2_client.py

@@ -777,9 +777,7 @@ def test_bash_variable_substitution(self):
         command = """for i in 1 2 3; do echo $i; done"""
         output = list(self.client.run_command(command)[self.host]['stdout'])
         expected = ['1','2','3']
-        self.assertEqual(output, expected,
-                         msg="Unexpected output from bash variable substitution %s - should be %s" % (
-                             output, expected,))
+        self.assertListEqual(output, expected)
 
     def test_identical_host_output(self):
         """Test that we get output when running with duplicated hosts"""
@@ -1133,6 +1131,13 @@ def test_run_command_sudo(self):
         self.assertTrue(self.host in output)
         self.assertTrue(output[self.host].channel is not None)
 
+    def test_run_command_sudo_var(self):
+        command = """for i in 1 2 3; do echo $i; done"""
+        output = list(self.client.run_command(
+            command, sudo=True)[self.host]['stdout'])
+        expected = ['1','2','3']
+        self.assertListEqual(output, expected)
+
     def test_conn_failure(self):
         """Test connection error failure case - ConnectionErrorException"""
         client = ParallelSSHClient(['127.0.0.100'], port=self.port,