summaryrefslogtreecommitdiff
path: root/cloudinit/distros/opensuse.py
diff options
context:
space:
mode:
authorParide Legovini <paride.legovini@canonical.com>2021-07-20 16:58:21 +0200
committerGitHub <noreply@github.com>2021-07-20 09:58:21 -0500
commitec6afadbf0f0f77d5b58dccd70df77da89c2c91d (patch)
tree5f1a719faf924b28cdc2d6958a3b6a8eb2c771bf /cloudinit/distros/opensuse.py
parenta984ee78b745b157b4b023a1786bfbd3b2002b88 (diff)
downloadvyos-cloud-init-ec6afadbf0f0f77d5b58dccd70df77da89c2c91d.tar.gz
vyos-cloud-init-ec6afadbf0f0f77d5b58dccd70df77da89c2c91d.zip
Update pylint to v2.9.3 and fix the new issues it spots (#946)
In CI run against pylint 2.9.3 and fix occurrences of: - W0237 (arguments-renamed) - W0402 (deprecated-module) The W0402 deprecated-module was about module `imp`: cloudinit/patcher.py:9: [W0402(deprecated-module), ] Uses of a deprecated module 'imp' The imp module is deprecated and replaced by importlib, which according to the documentation has no replacement for acquire_lock() and release_lock(), which are the only reason why `imp` is imported. Nothing about the code using this lock that actually requires it. Let's remove the locking code and the import altogether. Dropping the locking makes patcher.patch() an empty wrapper around _patch_logging(). Rename _patch_logging() to patch_logging() and call it directly instead. Drop patch().
Diffstat (limited to 'cloudinit/distros/opensuse.py')
-rw-r--r--cloudinit/distros/opensuse.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/cloudinit/distros/opensuse.py b/cloudinit/distros/opensuse.py
index b4193ac2..2a7497cc 100644
--- a/cloudinit/distros/opensuse.py
+++ b/cloudinit/distros/opensuse.py
@@ -150,9 +150,9 @@ class Distro(distros.Distro):
host_fn = self.hostname_conf_fn
return (host_fn, self._read_hostname(host_fn))
- def _write_hostname(self, hostname, out_fn):
- if self.uses_systemd() and out_fn.endswith('/previous-hostname'):
- util.write_file(out_fn, hostname)
+ def _write_hostname(self, hostname, filename):
+ if self.uses_systemd() and filename.endswith('/previous-hostname'):
+ util.write_file(filename, hostname)
elif self.uses_systemd():
subp.subp(['hostnamectl', 'set-hostname', str(hostname)])
else:
@@ -160,13 +160,13 @@ class Distro(distros.Distro):
try:
# Try to update the previous one
# so lets see if we can read it first.
- conf = self._read_hostname_conf(out_fn)
+ conf = self._read_hostname_conf(filename)
except IOError:
pass
if not conf:
conf = HostnameConf('')
conf.set_hostname(hostname)
- util.write_file(out_fn, str(conf), 0o644)
+ util.write_file(filename, str(conf), 0o644)
@property
def preferred_ntp_clients(self):