diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-09-02 12:18:21 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-09-02 12:18:21 -0400 |
| commit | cc77628e1ee3cd03d1ec2e17f1d744c8f4b0938b (patch) | |
| tree | e9bdcbc699eda6db5e57d35b25d222bead96da12 /cloudinit/distros/parsers/resolv_conf.py | |
| parent | fbfd3789ede42ad50e0b79f202ab18b65537af52 (diff) | |
| parent | e39abc783f7edd6435dbc7ea1fc3d02e6b3955d3 (diff) | |
| download | vyos-cloud-init-cc77628e1ee3cd03d1ec2e17f1d744c8f4b0938b.tar.gz vyos-cloud-init-cc77628e1ee3cd03d1ec2e17f1d744c8f4b0938b.zip | |
merge from trunk
Diffstat (limited to 'cloudinit/distros/parsers/resolv_conf.py')
| -rw-r--r-- | cloudinit/distros/parsers/resolv_conf.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/distros/parsers/resolv_conf.py b/cloudinit/distros/parsers/resolv_conf.py index 1be9d46b..5733c25a 100644 --- a/cloudinit/distros/parsers/resolv_conf.py +++ b/cloudinit/distros/parsers/resolv_conf.py @@ -137,8 +137,8 @@ class ResolvConf(object): self._contents.append(('option', ['search', s_list, ''])) return flat_sds - @local_domain.setter # pl51222 pylint: disable=E1101 - def local_domain(self, domain): # pl51222 pylint: disable=E0102 + @local_domain.setter + def local_domain(self, domain): self.parse() self._remove_option('domain') self._contents.append(('option', ['domain', str(domain), ''])) |