Restrict warning to userdata without MIME wrapping only while still ignoring most types

1 files changed, 8 insertions, 6 deletions

diff --git a/cloudinit/__init__.py b/cloudinit/__init__.py
index 98a48fec..1c3f861c 100644
--- a/cloudinit/__init__.py
+++ b/cloudinit/__init__.py
@@ -606,12 +606,14 @@ def partwalker_callback(pdata, ctype, filename, payload):
         partwalker_handle_handler(pdata, ctype, filename, payload)
         return
     if ctype not in pdata['handlers']:
-        start = payload.split("\n", 1)[0][:24] # Use first line or 24 bytes
-        if start < payload:
-            details = "starting '%s...'" % start.encode("string-escape")
-        else:
-            details = repr(payload)
-        log.warning("Unhandled userdata part of type %s %s", ctype, details)
+        if ctype == "text/x-not-multipart":
+            # Extract the first line or 24 bytes for displaying in the log
+            start = payload.split("\n", 1)[0][:24]
+            if start < payload:
+                details = "starting '%s...'" % start.encode("string-escape")
+            else:
+                details = repr(payload)
+            log.warning("Unhandled non-multipart userdata %s", details)
         return
     handler_handle_part(pdata['handlers'][ctype], pdata['data'],
         ctype, filename, payload, pdata['frequency'])