summaryrefslogtreecommitdiff
path: root/cloudinit/util.py
diff options
context:
space:
mode:
authorChad Smith <chad.smith@canonical.com>2018-01-26 13:36:30 -0700
committerChad Smith <chad.smith@canonical.com>2018-01-26 13:36:30 -0700
commit1d8c327139a8c291eeb244ee1a6a8badd83e9e72 (patch)
tree737b92f0e9d476a64e5a945fdaa0c6d7f4f2bf6f /cloudinit/util.py
parentbc84f5023f795c261e32cf0690b2d29e12cfaedd (diff)
downloadvyos-cloud-init-1d8c327139a8c291eeb244ee1a6a8badd83e9e72.tar.gz
vyos-cloud-init-1d8c327139a8c291eeb244ee1a6a8badd83e9e72.zip
Fix potential cases of uninitialized variables.
While addressing undeclared variable in 'cloud-init status', I also fixed the errors raised by automated code reviews against cloud-init master at https://lgtm.com/projects/g/cloud-init/cloud-init/alerts The following items are addressed:  * Fix 'cloud-init status':     * Only report 'running' state when any stage in /run/cloud-init/status.json has a start time but no finished time. Default start time to 0 if null.     * undeclared variable 'reason' now reports 'Cloud-init enabled by systemd cloud-init-generator' when systemd enables cloud-init  * cc_rh_subscription.py util.subp return values aren't set during if an exception is raised, use ProcessExecution as e instead.  * distros/freebsd.py:    * Drop repetitive looping over ipv4 and ipv6 nic lists.    * Initialize bsddev to 'NOTFOUND' in the event that no devs are discovered    * declare nics_with_addresses = set() in broader scope outside check_downable conditional  * cloudinit/util.py: Raise TypeError if mtype parameter isn't string, iterable or None. LP: #1744796
Diffstat (limited to 'cloudinit/util.py')
-rw-r--r--cloudinit/util.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/cloudinit/util.py b/cloudinit/util.py
index 9976400f..338fb971 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -1587,6 +1587,10 @@ def mount_cb(device, callback, data=None, rw=False, mtype=None, sync=True):
mtypes = list(mtype)
elif mtype is None:
mtypes = None
+ else:
+ raise TypeError(
+ 'Unsupported type provided for mtype parameter: {_type}'.format(
+ _type=type(mtype)))
# clean up 'mtype' input a bit based on platform.
platsys = platform.system().lower()