diff options
| author | Scott Moser <smoser@ubuntu.com> | 2012-01-30 09:24:41 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2012-01-30 09:24:41 -0500 |
| commit | fb2fb2ff30db6f1f06f15974a6f6be5c5ed518a6 (patch) | |
| tree | a21b34cd5979ff0f868b2b1ba2c3c1f14c794ff6 | |
| parent | 81ca0bc300ac5d8b8c0498727132e82dab72a396 (diff) | |
| download | vyos-cloud-init-fb2fb2ff30db6f1f06f15974a6f6be5c5ed518a6.tar.gz vyos-cloud-init-fb2fb2ff30db6f1f06f15974a6f6be5c5ed518a6.zip | |
support empty lines in '#include' files (LP: #923043)
LP: #923043
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | cloudinit/UserDataHandler.py | 2 |
2 files changed, 3 insertions, 0 deletions
@@ -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 diff --git a/cloudinit/UserDataHandler.py b/cloudinit/UserDataHandler.py index 93d1d36a..98729056 100644 --- a/cloudinit/UserDataHandler.py +++ b/cloudinit/UserDataHandler.py @@ -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 |