summaryrefslogtreecommitdiff
path: root/cloudinit/warnings.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2018-07-21 15:30:58 +0000
committerServer Team CI Bot <josh.powers+server-team-bot@canonical.com>2018-07-21 15:30:58 +0000
commit2a9d6203d946484cbe24297fe0e48a42a800756a (patch)
tree3af7ecced6004d4e525014687e0228838878bf3d /cloudinit/warnings.py
parente3e05e769a11cd2cb18e71150b05873dac95c84b (diff)
downloadvyos-cloud-init-2a9d6203d946484cbe24297fe0e48a42a800756a.tar.gz
vyos-cloud-init-2a9d6203d946484cbe24297fe0e48a42a800756a.zip
pylint: Fix pylint warnings reported in pylint 2.0.0.
Pylint 2.0.0 was recently released and complains more about logging-not-lazy than it used to. I've fixed those warnings, here. The changes in rh_subscription are more extensive. pylint may be complaining incorrectly there, but the tests were not correctly un-doing all of their mock/patching. This cleans those up and makes pylint happy.
Diffstat (limited to 'cloudinit/warnings.py')
-rw-r--r--cloudinit/warnings.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/warnings.py b/cloudinit/warnings.py
index f9f7a63c..1da90c40 100644
--- a/cloudinit/warnings.py
+++ b/cloudinit/warnings.py
@@ -130,7 +130,7 @@ def show_warning(name, cfg=None, sleep=None, mode=True, **kwargs):
os.path.join(_get_warn_dir(cfg), name),
topline + "\n".join(fmtlines) + "\n" + topline)
- LOG.warning(topline + "\n".join(fmtlines) + "\n" + closeline)
+ LOG.warning("%s%s\n%s", topline, "\n".join(fmtlines), closeline)
if sleep:
LOG.debug("sleeping %d seconds for warning '%s'", sleep, name)