diff options
author | Scott Moser <smoser@ubuntu.com> | 2016-07-13 22:14:13 -0400 |
---|---|---|
committer | Scott Moser <smoser@ubuntu.com> | 2016-07-13 22:14:13 -0400 |
commit | e1d68c11c44ab11acf3f7b234a1db45d85ae19de (patch) | |
tree | 9b7c46af243ebf14590eb711f05f243d8ba56cf8 /cloudinit/config/cc_write_files.py | |
parent | 2a8dc75a5b8ab42ca805f2ec6b97dc7a074e82f3 (diff) | |
parent | b3193a4b5204d12825d8317bf0f8c3577c1d8153 (diff) | |
download | vyos-cloud-init-e1d68c11c44ab11acf3f7b234a1db45d85ae19de.tar.gz vyos-cloud-init-e1d68c11c44ab11acf3f7b234a1db45d85ae19de.zip |
merge with trunk
Diffstat (limited to 'cloudinit/config/cc_write_files.py')
-rw-r--r-- | cloudinit/config/cc_write_files.py | 2 |
1 files changed, 2 insertions, 0 deletions
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) |