Import patches-applied version 2.2.12-0ubuntu1 to applied/ubuntu/artful-proposed

Imported using git-ubuntu import.

Changelog parent: 512b1e00ab9b75e46cc76af40c72cf239fa100e5
Unapplied parent: 6742198762e770442c4eb5d0eaa4a7a809f85424

New changelog entries:
  * New upstream release (LP: #1690854).
    - Refreshed debian/patches/disable_import_test.patch.

1 files changed, 12 insertions, 7 deletions

diff --git a/azurelinuxagent/common/utils/shellutil.py b/azurelinuxagent/common/utils/shellutil.py
index 4efcbc4..fff6aa8 100644
--- a/azurelinuxagent/common/utils/shellutil.py
+++ b/azurelinuxagent/common/utils/shellutil.py
@@ -76,18 +76,23 @@ def run_get_output(cmd, chk_err=True, log_cmd=True):
     Reports exceptions to Error if chk_err parameter is True
     """
     if log_cmd:
-        logger.verbose(u"run cmd '{0}'", cmd)
+        logger.verbose(u"Run '{0}'", cmd)
     try:
-        output = subprocess.check_output(cmd, stderr=subprocess.STDOUT,
+        output = subprocess.check_output(cmd,
+                                         stderr=subprocess.STDOUT,
                                          shell=True)
-        output = ustr(output, encoding='utf-8', errors="backslashreplace")
+        output = ustr(output,
+                      encoding='utf-8',
+                      errors="backslashreplace")
     except subprocess.CalledProcessError as e:
-        output = ustr(e.output, encoding='utf-8', errors="backslashreplace")
+        output = ustr(e.output,
+                      encoding='utf-8',
+                      errors="backslashreplace")
         if chk_err:
             if log_cmd:
-                logger.error(u"run cmd '{0}' failed", e.cmd)
-            logger.error(u"Error Code:{0}", e.returncode)
-            logger.error(u"Result:{0}", output)
+                logger.error(u"Command: '{0}'", e.cmd)
+            logger.error(u"Return code: {0}", e.returncode)
+            logger.error(u"Result: {0}", output)
         return e.returncode, output
     return 0, output