summaryrefslogtreecommitdiff
path: root/cloudinit/config/cc_disk_setup.py
diff options
context:
space:
mode:
authorJay Faulkner <jay@jvf.cc>2014-08-26 16:05:58 -0400
committerScott Moser <smoser@ubuntu.com>2014-08-26 16:05:58 -0400
commit31f9129c8a77aec8d3eb6fa649d1caa9b6df347e (patch)
tree10d634bc7732390c5043bd2ff1a678b5289abb93 /cloudinit/config/cc_disk_setup.py
parent190cacc430900d9d2dd4dd45c59d01e30e469720 (diff)
parent5fb6482692cfffba5ba45102858b14ba3acc5bc7 (diff)
downloadvyos-cloud-init-31f9129c8a77aec8d3eb6fa649d1caa9b6df347e.tar.gz
vyos-cloud-init-31f9129c8a77aec8d3eb6fa649d1caa9b6df347e.zip
Fix pep8 issues, drop pylint.
pep8: passes on pylint 1.5.7 (and 1.5.6 utopic). intent is that is to be the target for future changes. pylint: remove as more hassle than its worth. Intent is to move to pyflakes at some point.
Diffstat (limited to 'cloudinit/config/cc_disk_setup.py')
-rw-r--r--cloudinit/config/cc_disk_setup.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/cloudinit/config/cc_disk_setup.py b/cloudinit/config/cc_disk_setup.py
index 0b970e4e..1660832b 100644
--- a/cloudinit/config/cc_disk_setup.py
+++ b/cloudinit/config/cc_disk_setup.py
@@ -271,7 +271,7 @@ def find_device_node(device, fs_type=None, label=None, valid_targets=None,
return ('/dev/%s' % d['name'], False)
if (d['fstype'] == fs_type and
- ((label_match and d['label'] == label) or not label_match)):
+ ((label_match and d['label'] == label) or not label_match)):
# If we find a matching device, we return that
return ('/dev/%s' % d['name'], True)
@@ -447,7 +447,7 @@ def get_partition_mbr_layout(size, layout):
return "0,"
if ((len(layout) == 0 and isinstance(layout, list)) or
- not isinstance(layout, list)):
+ not isinstance(layout, list)):
raise Exception("Partition layout is invalid")
last_part_num = len(layout)
@@ -484,7 +484,7 @@ def get_partition_mbr_layout(size, layout):
def purge_disk_ptable(device):
# wipe the first and last megabyte of a disk (or file)
# gpt stores partition table both at front and at end.
- null = '\0' # pylint: disable=W1401
+ null = '\0'
start_len = 1024 * 1024
end_len = 1024 * 1024
with open(device, "rb+") as fp: