summaryrefslogtreecommitdiff
path: root/cloudinit/handlers/__init__.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2012-06-29 14:29:37 -0400
committerScott Moser <smoser@ubuntu.com>2012-06-29 14:29:37 -0400
commit093868a5cd60f163cbbbfb247544254bd2e20804 (patch)
tree9a87c5535eb56c3d0eec3d9bb6e29179a40a6c70 /cloudinit/handlers/__init__.py
parentc1be91b0192048b857e85ed8e0394d456f4c6ece (diff)
parent646384ccd6f1707b2712d9bcd683ae877f1903bd (diff)
downloadvyos-cloud-init-093868a5cd60f163cbbbfb247544254bd2e20804.tar.gz
vyos-cloud-init-093868a5cd60f163cbbbfb247544254bd2e20804.zip
[merge-from-trunk] remove warning message to console on empty user-data
Diffstat (limited to 'cloudinit/handlers/__init__.py')
-rw-r--r--cloudinit/handlers/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/handlers/__init__.py b/cloudinit/handlers/__init__.py
index 20a822bd..dce2abef 100644
--- a/cloudinit/handlers/__init__.py
+++ b/cloudinit/handlers/__init__.py
@@ -165,7 +165,7 @@ def walker_callback(pdata, ctype, filename, payload):
walker_handle_handler(pdata, ctype, filename, payload)
return
handlers = pdata['handlers']
- if ctype not in handlers:
+ if ctype not in pdata['handlers'] and payload:
# Extract the first line or 24 bytes for displaying in the log
start = _extract_first_or_bytes(payload, 24)
details = "'%s...'" % (start.encode("string-escape"))