napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove flake8 errors

Browse Source 
Remove the flake8 errors. This commit does not change any behaviour.
This commit is contained in:
apt-ghetto 2019-07-29 16:01:30 +02:00
parent 2bac96425f
commit 8a545941d4
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/modules/fstab/main.py
View File

@ -162,7 +162,6 @@ class FstabGenerator(object):
return None return None
mapper_name = partition["luksMapperName"] mapper_name = partition["luksMapperName"]
mount_point = partition["mountPoint"]
luks_uuid = partition["luksUuid"] luks_uuid = partition["luksUuid"]
if not mapper_name or not luks_uuid: if not mapper_name or not luks_uuid:
return None return None
@ -266,12 +265,12 @@ class FstabGenerator(object):
self.root_is_ssd = is_ssd self.root_is_ssd = is_ssd
if filesystem == "btrfs" and "subvol" in partition: if filesystem == "btrfs" and "subvol" in partition:
options="subvol={},".format(partition["subvol"]) + options options = "subvol={},".format(partition["subvol"]) + options
if has_luks: if has_luks:
device="/dev/mapper/" + partition["luksMapperName"] device = "/dev/mapper/" + partition["luksMapperName"]
else: else:
device="UUID=" + partition["uuid"] device = "UUID=" + partition["uuid"]
return dict(device=device, return dict(device=device,
mount_point=mount_point, mount_point=mount_point,
@ -308,13 +307,17 @@ def run():
root_mount_point = global_storage.value("rootMountPoint") root_mount_point = global_storage.value("rootMountPoint")
if not partitions: if not partitions:
libcalamares.utils.warning("partitions is empty, {!s}".format(partitions)) libcalamares.utils.warning("partitions is empty, {!s}"
.format(partitions))
return (_("Configuration Error"), return (_("Configuration Error"),
_("No partitions are defined for <pre>{!s}</pre> to use." ).format("fstab")) _("No partitions are defined for <pre>{!s}</pre> to use.")
.format("fstab"))
if not root_mount_point: if not root_mount_point:
libcalamares.utils.warning("rootMountPoint is empty, {!s}".format(root_mount_point)) libcalamares.utils.warning("rootMountPoint is empty, {!s}"
.format(root_mount_point))
return (_("Configuration Error"), return (_("Configuration Error"),
_("No root mount point is given for <pre>{!s}</pre> to use." ).format("fstab")) _("No root mount point is given for <pre>{!s}</pre> to use.")
.format("fstab"))
mount_options = conf["mountOptions"] mount_options = conf["mountOptions"]
ssd_extra_mount_options = conf.get("ssdExtraMountOptions", {}) ssd_extra_mount_options = conf.get("ssdExtraMountOptions", {})