diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-11-12 14:30:08 -0800 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-11-12 14:30:08 -0800 |
| commit | 82e90789f11b5371b352a477b75cad0c5d1457ec (patch) | |
| tree | bfe3fc01c2f70f8af2f438cdc32e50a820e76baa /cloudinit/distros/parsers/resolv_conf.py | |
| parent | bbe325c902ef3a3b8845cd3c1bb8bee0c3c74a89 (diff) | |
| download | vyos-cloud-init-82e90789f11b5371b352a477b75cad0c5d1457ec.tar.gz vyos-cloud-init-82e90789f11b5371b352a477b75cad0c5d1457ec.zip | |
Cleanup of /etc/hosts ordering and pep8/pylint adjustments.
Fix how the comparison of a fqdn and its aliases was done
via sorting instead of existence checking which is the better
way to check if a alias already exists as well as cleanup
the new files pep8/pylint issues.
LP: #1078097
Diffstat (limited to 'cloudinit/distros/parsers/resolv_conf.py')
| -rw-r--r-- | cloudinit/distros/parsers/resolv_conf.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cloudinit/distros/parsers/resolv_conf.py b/cloudinit/distros/parsers/resolv_conf.py index 377ada6b..5733c25a 100644 --- a/cloudinit/distros/parsers/resolv_conf.py +++ b/cloudinit/distros/parsers/resolv_conf.py @@ -127,7 +127,7 @@ class ResolvConf(object): # Hard restriction on only 6 search domains raise ValueError(("Adding %r would go beyond the " "'6' maximum search domains") % (search_domain)) - s_list = " ".join(new_sds) + s_list = " ".join(new_sds) if len(s_list) > 256: # Some hard limit on 256 chars total raise ValueError(("Adding %r would go beyond the " @@ -167,5 +167,3 @@ class ResolvConf(object): raise IOError("Unexpected resolv.conf option %s" % (cfg_opt)) entries.append(("option", [cfg_opt, cfg_values, tail])) return entries - - |