x/cloud-init
Code Issues Proposed changes

remove duplicate code

Browse Source
This commit is contained in:
Scott Moser 2013-10-04 17:32:48 -04:00
parent cc44ef561f
commit c5c8b81904
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cloudinit/config/cc_mounts.py
View File

@ -131,25 +131,11 @@ def handle(_name, cfg, cloud, log, _args):
start = defmnt[0] start = defmnt[0]
sanitized = sanitize_devname(start, cloud.device_name_to_device, log) sanitized = sanitize_devname(start, cloud.device_name_to_device, log)
if sanitized is None: if sanitized is None:
log.debug("Ignorming nonexistant named mount %s", start) log.debug("Ignoring nonexistant default named mount %s", start)
if sanitized != start: if sanitized != start:
log.debug("changed %s => %s" % (start, sanitized)) log.debug("changed default device %s => %s" % (start, sanitized))
defmnt[0] = sanitized defmnt[0] = sanitized
devname = defmnt[0]
if candidate_name is not None:
dev = candidate_name
if devname is None:
log.debug("Ignoring nonexistant named default mount %s", startname)
continue
devname = devnode_for_dev_part(devname, part)
if devname.startswith("/"):
defmnt[0] = devname
else:
defmnt[0] = "/dev/%s" % devname
log.debug("Mapped default device %s to %s", startname, defmnt[0])
cfgmnt_has = False cfgmnt_has = False
for cfgm in cfgmnt: for cfgm in cfgmnt:
if cfgm[0] == defmnt[0]: if cfgm[0] == defmnt[0]: