From c0450c02b25fe037c702e9bb145fbbaa28a165b1 Mon Sep 17 00:00:00 2001 From: Chad Smith Date: Mon, 24 Aug 2020 10:13:52 -0600 Subject: query: do not handle non-decodable non-gzipped content (#543) --- cloudinit/cmd/query.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'cloudinit/cmd/query.py') diff --git a/cloudinit/cmd/query.py b/cloudinit/cmd/query.py index 03b77c17..07db9552 100644 --- a/cloudinit/cmd/query.py +++ b/cloudinit/cmd/query.py @@ -86,14 +86,11 @@ def load_userdata(ud_file_path): @returns: String of uncompressed userdata if possible, otherwise bytes. """ + bdata = util.load_file(ud_file_path, decode=False) try: - return util.load_file(ud_file_path) + return bdata.decode('utf-8') except UnicodeDecodeError: - encoded_data = util.load_file(ud_file_path, decode=False) - try: - return util.decomp_gzip(encoded_data, quiet=False) - except util.DecompressionError: - return encoded_data + return util.decomp_gzip(bdata, quiet=False, decode=True) def handle_args(name, args): -- cgit v1.2.3