x/cloud-init
Code Issues Proposed changes

support empty lines in '#include' files (LP: #923043)

Browse Source
This commit is contained in:
Scott Moser 2012-01-30 09:24:41 -05:00
parent fd0d68806a
commit 038fd9a8ae
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -21,6 +21,7 @@
- fix pylint warnings [Juerg Haefliger] (LP: #914739)
- add support for adding and deleting CA Certificates [Mike Milner] (LP: #915232)
- in ci-info lines, use '.' to indicate empty field for easier machine reading
- support empty lines in "#include" files (LP: #923043)
0.6.2:
- fix bug where update was not done unless update was explicitly set.
It would not be run if 'upgrade' or packages were set to be installed

2
cloudinit/UserDataHandler.py
View File

@ -71,6 +71,8 @@ def do_include(content, appendmsg):
line = line[len("#include"):].lstrip()
if line.startswith("#"):
continue
if line.strip() == "":
continue
# urls cannot not have leading or trailing white space
msum = hashlib.md5() # pylint: disable=E1101