summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Howard <ben.howard@canonical.com>2013-10-03 17:07:23 -0600
committerBen Howard <ben.howard@canonical.com>2013-10-03 17:07:23 -0600
commit193704c37b97a5687cab09416f9f38e632c76fa3 (patch)
tree288b618e19dfb9f3db47e6ecca5b92392dc11d0f
parent6bbe48d8551919960b3f4acce6299b0a6a53e9d5 (diff)
downloadvyos-cloud-init-193704c37b97a5687cab09416f9f38e632c76fa3.tar.gz
vyos-cloud-init-193704c37b97a5687cab09416f9f38e632c76fa3.zip
Make {pep8,pylint,test} pass commit.
-rw-r--r--cloudinit/config/cc_disk_setup.py3
-rw-r--r--cloudinit/util.py2
2 files changed, 2 insertions, 3 deletions
diff --git a/cloudinit/config/cc_disk_setup.py b/cloudinit/config/cc_disk_setup.py
index b9e1e9eb..127b5879 100644
--- a/cloudinit/config/cc_disk_setup.py
+++ b/cloudinit/config/cc_disk_setup.py
@@ -186,6 +186,7 @@ def enumerate_disk(device, nodeps=False):
yield d
+
def device_type(device):
"""
Return the device type of the device by calling lsblk.
@@ -193,7 +194,7 @@ def device_type(device):
for d in enumerate_disk(device, nodeps=True):
if "type" in d:
- return d["type"].lower()
+ return d["type"].lower()
return None
diff --git a/cloudinit/util.py b/cloudinit/util.py
index 053e1efc..34d111e7 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -1903,5 +1903,3 @@ def map_device_alias(device, partition=None, alias=None):
partition, device))
return None
-
-