diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-06-21 14:37:23 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-06-21 14:37:23 -0400 |
| commit | a919f6e6ee3bfaf489411a4452fc708061b1239f (patch) | |
| tree | ecc28dab5c4dc8526c23f1fd2aa017942d66415f | |
| parent | e6b594bf2bf4cd40bbfbe9581c2b62f3b77e9123 (diff) | |
| download | vyos-cloud-init-a919f6e6ee3bfaf489411a4452fc708061b1239f.tar.gz vyos-cloud-init-a919f6e6ee3bfaf489411a4452fc708061b1239f.zip | |
write_files: if no permissions are given, just use default without warn.
if no permissions were given in a write_files stanza, then
a warning would be emitted.
The fix here is just to special case handling of None.
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | cloudinit/config/cc_write_files.py | 2 |
2 files changed, 3 insertions, 0 deletions
@@ -124,6 +124,7 @@ - Change missing Cheetah log warning to debug [Andrew Jorgensen] - Remove trailing dot from GCE metadata URL (LP: #1581200) [Phil Roche] - support network rendering to sysconfig (for centos and RHEL) + - write_files: if no permissions are given, just use default without warn. 0.7.6: - open 0.7.6 diff --git a/cloudinit/config/cc_write_files.py b/cloudinit/config/cc_write_files.py index 351cfc8c..b1096b9b 100644 --- a/cloudinit/config/cc_write_files.py +++ b/cloudinit/config/cc_write_files.py @@ -79,6 +79,8 @@ def write_files(name, files, log): def decode_perms(perm, default, log): + if perm is None: + return default try: if isinstance(perm, six.integer_types + (float,)): # Just 'downcast' it (if a float) |