write_files: fix decompression of content

When provided with gzipped data, an exception would be raised
because of a conversion to string.

This fixes the issue and adds a test for write_files.

LP: #1565638

2 files changed, 6 insertions, 3 deletions

diff --git a/cloudinit/config/cc_write_files.py b/cloudinit/config/cc_write_files.py
index 4b03ea91..351cfc8c 100644
--- a/cloudinit/config/cc_write_files.py
+++ b/cloudinit/config/cc_write_files.py
@@ -92,10 +92,10 @@ def decode_perms(perm, default, log):
 
 
 def extract_contents(contents, extraction_types):
-    result = str(contents)
+    result = contents
     for t in extraction_types:
         if t == 'application/x-gzip':
-            result = util.decomp_gzip(result, quiet=False)
+            result = util.decomp_gzip(result, quiet=False, decode=False)
         elif t == 'application/base64':
             result = base64.b64decode(result)
         elif t == UNKNOWN_ENC:
diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py
index 418421b9..12983c0a 100644
--- a/cloudinit/distros/__init__.py
+++ b/cloudinit/distros/__init__.py
@@ -933,7 +933,10 @@ def set_etc_timezone(tz, tz_file=None, tz_conf="/etc/timezone",
     # This ensures that the correct tz will be used for the system
     if tz_local and tz_file:
         # use a symlink if there exists a symlink or tz_local is not present
-        if os.path.islink(tz_local) or not os.path.exists(tz_local):
+        islink = os.path.islink(tz_local)
+        if islink or not os.path.exists(tz_local):
+            if islink:
+                util.del_file(tz_local)
             os.symlink(tz_file, tz_local)
         else:
             util.copy(tz_file, tz_local)