summaryrefslogtreecommitdiff
path: root/cloudinit/net/cmdline.py
diff options
context:
space:
mode:
authorChad Smith <chad.smith@canonical.com>2017-12-15 15:24:53 -0700
committerChad Smith <chad.smith@canonical.com>2017-12-15 15:24:53 -0700
commitc6a6f59e80f1fd62562b1fe9acfd45e1cee3cbe8 (patch)
tree97d76fe696a8822618842b83335dec1b7e9cdf5a /cloudinit/net/cmdline.py
parent4089e20c0a20bc2ad5c21b106687c4f3faf84b4b (diff)
downloadvyos-cloud-init-c6a6f59e80f1fd62562b1fe9acfd45e1cee3cbe8.tar.gz
vyos-cloud-init-c6a6f59e80f1fd62562b1fe9acfd45e1cee3cbe8.zip
lint: Fix lints seen by pylint version 1.8.1.
This branch resolves lints seen by pylint revision 1.8.1 and updates our pinned tox pylint dependency used by our tox pylint target.
Diffstat (limited to 'cloudinit/net/cmdline.py')
-rwxr-xr-xcloudinit/net/cmdline.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/cloudinit/net/cmdline.py b/cloudinit/net/cmdline.py
index 38b27a52..7b2cc9db 100755
--- a/cloudinit/net/cmdline.py
+++ b/cloudinit/net/cmdline.py
@@ -116,10 +116,11 @@ def config_from_klibc_net_cfg(files=None, mac_addrs=None):
prev = names[name]['entry']
if prev.get('mac_address') != entry.get('mac_address'):
raise ValueError(
- "device '%s' was defined multiple times (%s)"
- " but had differing mac addresses: %s -> %s.",
- (name, ' '.join(names[name]['files']),
- prev.get('mac_address'), entry.get('mac_address')))
+ "device '{name}' was defined multiple times ({files})"
+ " but had differing mac addresses: {old} -> {new}.".format(
+ name=name, files=' '.join(names[name]['files']),
+ old=prev.get('mac_address'),
+ new=entry.get('mac_address')))
prev['subnets'].extend(entry['subnets'])
names[name]['files'].append(cfg_file)
else: