← Back to team overview

cloud-init-dev team mailing list archive

[Merge] lp:~avishai-ish-shalom/cloud-init/1065116 into lp:cloud-init

 

Scott Moser has proposed merging lp:~avishai-ish-shalom/cloud-init/1065116 into lp:cloud-init.

Requested reviews:
  cloud init development team (cloud-init-dev)
Related bugs:
  Bug #1065116 in cloud-init: "cloud-init fails when encountering unexpected header"
  https://bugs.launchpad.net/cloud-init/+bug/1065116

For more details, see:
https://code.launchpad.net/~avishai-ish-shalom/cloud-init/1065116/+merge/129412
-- 
https://code.launchpad.net/~avishai-ish-shalom/cloud-init/1065116/+merge/129412
Your team cloud init development team is requested to review the proposed merge of lp:~avishai-ish-shalom/cloud-init/1065116 into lp:cloud-init.
=== modified file 'cloudinit/user_data.py'
--- cloudinit/user_data.py	2012-09-01 01:12:30 +0000
+++ cloudinit/user_data.py	2012-10-12 12:42:56 +0000
@@ -224,7 +224,7 @@
             for header in list(ent.keys()):
                 if header in ('content', 'filename', 'type', 'launch-index'):
                     continue
-                msg.add_header(header, ent['header'])
+                msg.add_header(header, ent[header])
 
             self._attach_part(append_msg, msg)
 


Follow ups