summaryrefslogtreecommitdiff
path: root/cloudinit/distros/freebsd.py
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2016-08-23 16:48:39 -0400
committerScott Moser <smoser@brickies.net>2016-08-23 16:48:39 -0400
commit90de5dfa9685a9585b651c38b21274a9aa05ec38 (patch)
tree238e33b0122e68154bc5773186b5938bac2fe34f /cloudinit/distros/freebsd.py
parent0ec34747b61845bfce806065dd126dcb56fe4672 (diff)
parent5db46cfb68422b0c14d4a6c097553edd0016de3f (diff)
downloadvyos-cloud-init-90de5dfa9685a9585b651c38b21274a9aa05ec38.tar.gz
vyos-cloud-init-90de5dfa9685a9585b651c38b21274a9aa05ec38.zip
merge trunk at 0.7.7~bzr1176
Diffstat (limited to 'cloudinit/distros/freebsd.py')
-rw-r--r--cloudinit/distros/freebsd.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/distros/freebsd.py b/cloudinit/distros/freebsd.py
index 4c484639..72012056 100644
--- a/cloudinit/distros/freebsd.py
+++ b/cloudinit/distros/freebsd.py
@@ -205,8 +205,8 @@ class Distro(distros.Distro):
redact_opts = ['passwd']
for key, val in kwargs.items():
- if (key in adduser_opts and val
- and isinstance(val, six.string_types)):
+ if (key in adduser_opts and val and
+ isinstance(val, six.string_types)):
adduser_cmd.extend([adduser_opts[key], val])
# Redact certain fields from the logs