From 585284eca9e9219c6517eebc02d45edc800cf72d Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Thu, 22 Dec 2011 03:40:52 -0500
Subject: fix issue with multiple content-types

---
 cloudinit/UserDataHandler.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'cloudinit')

diff --git a/cloudinit/UserDataHandler.py b/cloudinit/UserDataHandler.py
index 84ad9c9b..541ee87a 100644
--- a/cloudinit/UserDataHandler.py
+++ b/cloudinit/UserDataHandler.py
@@ -183,7 +183,11 @@ def process_includes(msg, appendmsg=None):
             explode_cc_archive(payload, appendmsg)
             continue
 
-        part['Content-Type'] = ctype
+        if 'Content-Type' in msg:
+            msg.replace_header('Content-Type', ctype)
+        else:
+            msg['Content-Type'] = ctype
+
         _attach_part(appendmsg, part)
 
 def message_from_string(data, headers={}):
-- 
cgit v1.2.3