From 4fb0b5a09b26135ade285844da5d7dfe582a8d4c Mon Sep 17 00:00:00 2001
From: Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>
Date: Thu, 18 May 2017 19:58:02 +0200
Subject: Import patches-unapplied version 2.2.12-0ubuntu1 to
 ubuntu/artful-proposed

Imported using git-ubuntu import.

Changelog parent: 473ad6fbfe0b9c3b362b530492928303f2b4c7f3

New changelog entries:
  * New upstream release (LP: #1690854).
    - Refreshed debian/patches/disable_import_test.patch.
---
 azurelinuxagent/common/utils/cryptutil.py |  2 +-
 azurelinuxagent/common/utils/fileutil.py  | 22 +++++++++++++---------
 azurelinuxagent/common/utils/shellutil.py | 19 ++++++++++++-------
 3 files changed, 26 insertions(+), 17 deletions(-)

(limited to 'azurelinuxagent/common/utils')

diff --git a/azurelinuxagent/common/utils/cryptutil.py b/azurelinuxagent/common/utils/cryptutil.py
index b35bda0..6339eb3 100644
--- a/azurelinuxagent/common/utils/cryptutil.py
+++ b/azurelinuxagent/common/utils/cryptutil.py
@@ -31,7 +31,7 @@ class CryptUtil(object):
         """
         Create ssl certificate for https communication with endpoint server.
         """
-        cmd = ("{0} req -x509 -nodes -subj /CN=LinuxTransport -days 32768 "
+        cmd = ("{0} req -x509 -nodes -subj /CN=LinuxTransport -days 730 "
                "-newkey rsa:2048 -keyout {1} "
                "-out {2}").format(self.openssl_cmd, prv_file, crt_file)
         shellutil.run(cmd)
diff --git a/azurelinuxagent/common/utils/fileutil.py b/azurelinuxagent/common/utils/fileutil.py
index 8713d0c..bae1957 100644
--- a/azurelinuxagent/common/utils/fileutil.py
+++ b/azurelinuxagent/common/utils/fileutil.py
@@ -119,16 +119,20 @@ def rm_files(*args):
 
 def rm_dirs(*args):
     """
-    Remove all the contents under the directry
+    Remove the contents of each directry
     """
-    for dir_name in args:
-        if os.path.isdir(dir_name):
-            for item in os.listdir(dir_name):
-                path = os.path.join(dir_name, item)
-                if os.path.isfile(path):
-                    os.remove(path)
-                elif os.path.isdir(path):
-                    shutil.rmtree(path)
+    for p in args:
+        if not os.path.isdir(p):
+            continue
+
+        for pp in os.listdir(p):
+            path = os.path.join(p, pp)
+            if os.path.isfile(path):
+                os.remove(path)
+            elif os.path.islink(path):
+                os.unlink(path)
+            elif os.path.isdir(path):
+                shutil.rmtree(path)
 
 def trim_ext(path, ext):
     if not ext.startswith("."):
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
 
-- 
cgit v1.2.3