Рефакторинг

* импорт целого модуля device, вместо его полей
parent 0d055e1398
commit 1be039ff34

@ -29,7 +29,8 @@ from .action import Actions
import linux as vars_linux
import datetime
from calculate.install import distr
from calculate.lib.utils.device import udev, humanreadableSize
import calculate.lib.utils.device as device
from calculate.lib.utils.device import humanreadableSize
from calculate.lib.utils.files import (process, typeFile,
listDirectory,
pathJoin, readFile, check_rw)
@ -332,7 +333,8 @@ class VariableClBuilderDiskDev(Variable):
raise VariableError(
_("You need to select a destination for build"))
if value.startswith("/dev"):
cnDisk = udev.get_device_info(name=value).get('DEVNAME', value)
cnDisk = device.udev.get_device_info(
name=value).get('DEVNAME', value)
if cnDisk not in self.Get('install.os_disk_dev'):
raise VariableError(_("Wrong device '%s'") % value)
if not value.startswith('/'):

Loading…
Cancel
Save