get_cmdline_url: fix in python3 when calling

get_cmdline_url was passing a string to response.contents.startswith()
where response.contents is now bytes.

this changes it to convert input to text, and also to default to text.

1 files changed, 3 insertions, 1 deletions

diff --git a/cloudinit/util.py b/cloudinit/util.py
index 039aa3f2..cc20305c 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -970,7 +970,7 @@ def get_fqdn_from_hosts(hostname, filename="/etc/hosts"):
 
 
 def get_cmdline_url(names=('cloud-config-url', 'url'),
-                    starts="#cloud-config", cmdline=None):
+                    starts=b"#cloud-config", cmdline=None):
     if cmdline is None:
         cmdline = get_cmdline()
 
@@ -986,6 +986,8 @@ def get_cmdline_url(names=('cloud-config-url', 'url'),
         return (None, None, None)
 
     resp = read_file_or_url(url)
+    # allow callers to pass starts as text when comparing to bytes contents
+    starts = encode_text(starts)
     if resp.ok() and resp.contents.startswith(starts):
         return (key, url, resp.contents)