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 | |
| 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')
| -rw-r--r-- | cloudinit/distros/parsers/__init__.py | 1 | ||||
| -rw-r--r-- | cloudinit/distros/parsers/hostname.py | 2 | ||||
| -rw-r--r-- | cloudinit/distros/parsers/resolv_conf.py | 4 | ||||
| -rw-r--r-- | cloudinit/distros/parsers/sys_conf.py | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/cloudinit/distros/parsers/__init__.py b/cloudinit/distros/parsers/__init__.py index 8334a5e6..1c413eaa 100644 --- a/cloudinit/distros/parsers/__init__.py +++ b/cloudinit/distros/parsers/__init__.py @@ -16,6 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. + def chop_comment(text, comment_chars): comment_locations = [text.find(c) for c in comment_chars] comment_locations = [c for c in comment_locations if c != -1] diff --git a/cloudinit/distros/parsers/hostname.py b/cloudinit/distros/parsers/hostname.py index 7e19f017..617b3c36 100644 --- a/cloudinit/distros/parsers/hostname.py +++ b/cloudinit/distros/parsers/hostname.py @@ -86,5 +86,3 @@ class HostnameConf(object): raise IOError("Multiple hostnames (%s) found!" % (hostnames_found)) return entries - - 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 - - diff --git a/cloudinit/distros/parsers/sys_conf.py b/cloudinit/distros/parsers/sys_conf.py index 5cd765fc..20ca1871 100644 --- a/cloudinit/distros/parsers/sys_conf.py +++ b/cloudinit/distros/parsers/sys_conf.py @@ -40,7 +40,7 @@ SHELL_VAR_REGEXES = [ # Things like $?, $0, $-, $@ re.compile(r"\$[0-9#\?\-@\*]"), # Things like ${blah:1} - but this one - # gets very complex so just try the + # gets very complex so just try the # simple path re.compile(r"\$\{.+\}"), ] |