Merge lp:~javier.collado/utah/bug1123896 into lp:utah

[Javier Collado]

This branch makes sure that warning messages for command failures contain the
command that failed to make sure it's clear even if log level isn't set to
debug.

[Andy Doan (doanac)]

+1 - this would have saved me about an hour yesterday :)

[Max Brustkern (nuclearbob)]

Looks good to me.

review: Approve

=== modified file 'utah/provisioning/provisioning.py'
--- utah/provisioning/provisioning.py	2013-02-08 16:59:00 +0000
+++ utah/provisioning/provisioning.py	2013-02-13 15:46:26 +0000
@@ -565,9 +565,11 @@
         output = '\n'.join(output)
 
         returncode = p.returncode
-        log_level = logging.DEBUG if returncode == 0 else logging.WARNING
-        log_message = 'Return code: {}'.format(returncode)
-        self.logger.log(log_level, log_message)
+        if returncode == 0:
+            self.logger.debug('Return code: {}'.format(returncode))
+        else:
+            self.logger.warning('Command ({}) failed with return code: {}'
+                                .format(' '.join(arglist), returncode))
 
         return {'returncode': returncode,
                 'output': output}

=== modified file 'utah/provisioning/ssh.py'
--- utah/provisioning/ssh.py	2013-02-01 11:49:19 +0000
+++ utah/provisioning/ssh.py	2013-02-13 15:46:26 +0000
@@ -96,9 +96,12 @@
         self.ssh_logger.debug('Closing SSH connection')
         self.ssh_client.close()
 
-        log_level = logging.DEBUG if retval == 0 else logging.WARNING
-        log_message = 'Return code: {}'.format(retval)
-        self.ssh_logger.log(log_level, log_message)
+        if retval == 0:
+            self.ssh_logger.debug('Return code: {}'.format(retval))
+        else:
+            self.ssh_logger.warning(
+                'SSH command ({}) failed with return code: {}'
+                .format(commandstring, retval))
 
         self.ssh_logger.debug('Standard output follows:')
         stdout_lines = stdout.readlines()