more datavars fixes

py3_forced
idziubenko 3 years ago
parent b1a5dc6e64
commit 072415613f

@ -607,8 +607,9 @@ class VariableOsDiskType(ReadonlyVariable):
def get(self):
"""Get partition scheme"""
types = map(lambda x: (x, device.udev.get_device_type(name=x)),
self.Get('os_disk_dev'))
types = list(map(lambda x: (x, device.udev.get_device_type(name=x)),
self.Get('os_disk_dev')))
lvmUsedDisks = {}
raidUsedDisks = {}
@ -622,7 +623,6 @@ class VariableOsDiskType(ReadonlyVariable):
",".join(
lvmUsedDisks[diskName]))
return diskName, diskType
for dev, diskType in types:
prop = device.udev.get_device_info(name=dev)
if self.re_raid.search(diskType):
@ -766,7 +766,7 @@ class VariableOsDiskPart(ReadonlyVariable):
If gpt then gpt
"""
type = "list"
def get(self):
def generator():
for disk_dev, disk_type in self.ZipVars(

Loading…
Cancel
Save