diff options
| author | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:41 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:41 -0400 |
| commit | 5994f3bc480c918d8756ab0cb8ecfa34975eb307 (patch) | |
| tree | 893c47ee8e3523982081f600bf770ffd68a54ac7 /cloudinit/config/cc_write_files.py | |
| parent | 1355ce5e2b53b063cde2825b6df9de1cdd2b1797 (diff) | |
| parent | d75a912fb375afbab055db3178966d1f83b44143 (diff) | |
| download | vyos-cloud-init-5994f3bc480c918d8756ab0cb8ecfa34975eb307.tar.gz vyos-cloud-init-5994f3bc480c918d8756ab0cb8ecfa34975eb307.zip | |
merge trunk at 0.7.7~bzr1200
Diffstat (limited to 'cloudinit/config/cc_write_files.py')
| -rw-r--r-- | cloudinit/config/cc_write_files.py | 4 |
1 files changed, 2 insertions, 2 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: |