lp:~harlowja/cloud-init/cloud-init-fix-rpm-argparse

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~cloud-init-dev/cloud-init/trunk at revision 1257

Scott Moser: Approve on 2016-07-15

Diff: 13 lines (+3/-0)

1 file modified

packages/brpm (+3/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1603533: Can't build correctly using brpm on cent7

Medium

Fix Released

Link a bug report

Related blueprints

1254. By Joshua Harlow on 2016-07-15

Avoid depending on argparse in 2.7 or greater

Its not needed since its a built-in for these
versions so we can just skip it for any newer
rpm building in the first place.

1253. By Joshua Harlow on 2016-07-13

Fix SmartOS datasource usage of dict comprehensions

1252. By Joshua Harlow on 2016-07-13

String format requires positions on python 2.6

1251. By Joshua Harlow on 2016-07-13

Another stray occurence of a dict comprehension being removed

1250. By Joshua Harlow on 2016-07-13

Remove another stray dict comprehension

1249. By Joshua Harlow on 2016-07-13

Fixes missing/unpacked rpm files

There are a few new files that are missing from being
included in the rpm specification file (which if missing
causes rpmbuild to die) so make sure we add them in.

1248. By Joshua Harlow on 2016-07-13

Dict comprehensions don't work in 2.6

This fixes a small case of a leftover
dict comprehension being found that stops cloud-init
from working on centos6/rhel6 (which still use py2.6)

1247. By Scott Moser on 2016-06-28

distros/debian.py: fix calling of eni renderer to not render link files

Under revno 1243 a failed attempt was made to not render systemd.link
files into /etc/systemd/network/ . The 'config' that was passed in was
incorrect though, and resulted in link files still getting rendered.

(original bug was LP: #1594546).

1246. By Scott Moser on 2016-06-27

fix restoring from a datasource that did not have dsmode

On upgrade and reboot, if datasource restored from obj.pkl did not have
a dsmode attribute, then 'init --local' would fail due to stack trace.

1245. By Scott Moser on 2016-06-22

user_data: fix error when user-data is not utf-8 decodable

when user-data was not decodable, cloud-init would raise exception.
This also changes the signature of user_data.convert_string.
The 'headers' argument was never used, and woudl have been broken
if it was, as it was expected to be a dictionary but then was
passed in with *headers.