summaryrefslogtreecommitdiff
path: root/cloudinit/distros
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2015-01-27 14:24:22 -0500
committerBarry Warsaw <barry@python.org>2015-01-27 14:24:22 -0500
commit1e76dad45e3bce4dac5a638dda970fc02a044dbb (patch)
treef0d3400f9f76c3ef53d018ba89efe484af8dc68c /cloudinit/distros
parente2cfd12dc79a6350d9f1f3111a15bdb6666ccad7 (diff)
downloadvyos-cloud-init-1e76dad45e3bce4dac5a638dda970fc02a044dbb.tar.gz
vyos-cloud-init-1e76dad45e3bce4dac5a638dda970fc02a044dbb.zip
Respond to review:
- Remove str() wrappers to second argument to write_files() where it is no longer necessary. Also: Fixed a couple of other octal literals which clearly weren't being tested.
Diffstat (limited to 'cloudinit/distros')
-rw-r--r--cloudinit/distros/arch.py2
-rw-r--r--cloudinit/distros/gentoo.py2
-rw-r--r--cloudinit/distros/rhel_util.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/cloudinit/distros/arch.py b/cloudinit/distros/arch.py
index e540e0bc..45fcf26f 100644
--- a/cloudinit/distros/arch.py
+++ b/cloudinit/distros/arch.py
@@ -129,7 +129,7 @@ class Distro(distros.Distro):
if not conf:
conf = HostnameConf('')
conf.set_hostname(your_hostname)
- util.write_file(out_fn, str(conf), 0644)
+ util.write_file(out_fn, conf, 0o644)
def _read_system_hostname(self):
sys_hostname = self._read_hostname(self.hostname_conf_fn)
diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py
index 09dd0d73..9e80583c 100644
--- a/cloudinit/distros/gentoo.py
+++ b/cloudinit/distros/gentoo.py
@@ -108,7 +108,7 @@ class Distro(distros.Distro):
if not conf:
conf = HostnameConf('')
conf.set_hostname(your_hostname)
- util.write_file(out_fn, str(conf), 0644)
+ util.write_file(out_fn, conf, 0o644)
def _read_system_hostname(self):
sys_hostname = self._read_hostname(self.hostname_conf_fn)
diff --git a/cloudinit/distros/rhel_util.py b/cloudinit/distros/rhel_util.py
index 903d7793..84aad623 100644
--- a/cloudinit/distros/rhel_util.py
+++ b/cloudinit/distros/rhel_util.py
@@ -86,4 +86,4 @@ def update_resolve_conf_file(fn, dns_servers, search_servers):
r_conf.add_search_domain(s)
except ValueError:
util.logexc(LOG, "Failed at adding search domain %s", s)
- util.write_file(fn, str(r_conf), 0o644)
+ util.write_file(fn, r_conf, 0o644)