x/cloud-init
Code Issues Proposed changes

fix: Updated some syntax to be pep8 compliant

Browse Source
This commit is contained in:
Joseph Bajin 2014-08-18 11:16:45 -04:00
parent ec851fa839
commit f71e050f44
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cloudinit/sources/DataSourceConfigDrive.py
View File

@ -38,7 +38,7 @@ VALID_DSMODES = ("local", "net", "pass", "disabled")
FS_TYPES = ('vfat', 'iso9660') FS_TYPES = ('vfat', 'iso9660')
LABEL_TYPES = ('config-2',) LABEL_TYPES = ('config-2',)
POSSIBLE_MOUNTS = ('sr', 'cd') POSSIBLE_MOUNTS = ('sr', 'cd')
OPTICAL_DEVICES = tuple(('/dev/%s%s' % (z,i) for z in POSSIBLE_MOUNTS OPTICAL_DEVICES = tuple(('/dev/%s%s' % (z, i) for z in POSSIBLE_MOUNTS
for i in range(0, 2))) for i in range(0, 2)))
@ -75,10 +75,10 @@ class DataSourceConfigDrive(openstack.SourceMixin, sources.DataSource):
# Set mtype if freebsd and turn off sync # Set mtype if freebsd and turn off sync
if dev.startswith("/dev/cd"): if dev.startswith("/dev/cd"):
mtype = "cd9660" mtype = "cd9660"
sync = False sync = False
else: else:
mtype = None mtype = None
sync = True sync = True
results = util.mount_cb(dev, read_config_drive, mtype=mtype, results = util.mount_cb(dev, read_config_drive, mtype=mtype,
sync=sync) sync=sync)
found = dev found = dev

2
cloudinit/util.py
View File

@ -1391,7 +1391,7 @@ def mount_cb(device, callback, data=None, rw=False, mtype=None, sync=True):
lazy_support = False lazy_support = False
else: else:
lazy_support = True lazy_support = True
with unmounter(umount,lazy_support): with unmounter(umount, lazy_support):
if data is None: if data is None:
ret = callback(mountpoint) ret = callback(mountpoint)
else: else: