summaryrefslogtreecommitdiff
path: root/cloudinit/distros/parsers/resolv_conf.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/parsers/resolv_conf.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/parsers/resolv_conf.py')
-rw-r--r--cloudinit/distros/parsers/resolv_conf.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/distros/parsers/resolv_conf.py b/cloudinit/distros/parsers/resolv_conf.py
index 8aee03a4..2ed13d9c 100644
--- a/cloudinit/distros/parsers/resolv_conf.py
+++ b/cloudinit/distros/parsers/resolv_conf.py
@@ -132,7 +132,7 @@ class ResolvConf(object):
# Some hard limit on 256 chars total
raise ValueError(("Adding %r would go beyond the "
"256 maximum search list character limit")
- % (search_domain))
+ % (search_domain))
self._remove_option('search')
self._contents.append(('option', ['search', s_list, '']))
return flat_sds