From d8df3d7a592b8b67d23ef0ec77c3bef656a88c24 Mon Sep 17 00:00:00 2001 From: Gormogon Date: Wed, 18 Feb 2015 09:37:03 -0500 Subject: [PATCH] [PEP 8] General Style Part 1 --- src/modules/dracut/main.py | 2 ++ src/modules/fstab/main.py | 7 ++++--- src/modules/grub/main.py | 16 ++++++++++++---- src/modules/grubcfg/main.py | 28 ++++++++++++++-------------- src/modules/mount/main.py | 2 +- 5 files changed, 33 insertions(+), 22 deletions(-) diff --git a/src/modules/dracut/main.py b/src/modules/dracut/main.py index df1f70588..8b72e4cc5 100644 --- a/src/modules/dracut/main.py +++ b/src/modules/dracut/main.py @@ -22,9 +22,11 @@ import libcalamares from libcalamares.utils import chroot_call + def run_dracut(): return chroot_call(['dracut', '-f']) + def run(): returnCode = run_dracut() if returnCode != 0: diff --git a/src/modules/fstab/main.py b/src/modules/fstab/main.py index fc17ff60a..336b354f4 100644 --- a/src/modules/fstab/main.py +++ b/src/modules/fstab/main.py @@ -61,7 +61,7 @@ def disk_name_for_partition(partition): class FstabGenerator(object): def __init__(self, partitions, root_mount_point, mount_options, - ssd_extra_mount_options): + ssd_extra_mount_options): self.partitions = partitions self.root_mount_point = root_mount_point self.mount_options = mount_options @@ -98,7 +98,7 @@ class FstabGenerator(object): fs="tmpfs", options="defaults,noatime,mode=1777", check=0, - ) + ) self.print_fstab_line(dct, file=fl) def generate_fstab_line_info(self, partition): @@ -149,6 +149,7 @@ class FstabGenerator(object): if partition["mountPoint"]: mkdir_p(self.root_mount_point + partition["mountPoint"]) + def run(): gs = libcalamares.globalstorage conf = libcalamares.job.configuration @@ -159,5 +160,5 @@ def run(): ssd_extra_mount_options = conf.get("ssdExtraMountOptions", {}) generator = FstabGenerator(partitions, root_mount_point, - mount_options, ssd_extra_mount_options) + mount_options, ssd_extra_mount_options) return generator.run() diff --git a/src/modules/grub/main.py b/src/modules/grub/main.py index 3af215e6b..64e1b1eba 100644 --- a/src/modules/grub/main.py +++ b/src/modules/grub/main.py @@ -37,15 +37,23 @@ def install_grub(boot_loader, fw_type): distribution = branding["bootloaderEntryName"] file_name_sanitizer = str.maketrans(" /", "_-") efi_bootloader_id = distribution.translate(file_name_sanitizer) - check_chroot_call([libcalamares.job.configuration["grubInstall"], "--target=x86_64-efi", "--efi-directory={!s}".format(efi_directory), "--bootloader-id={!s}".format(efi_bootloader_id)]) + check_chroot_call( + [libcalamares.job.configuration["grubInstall"], "--target=x86_64-efi", + "--efi-directory={!s}".format(efi_directory), + "--bootloader-id={!s}".format(efi_bootloader_id)]) # Workaround for some UEFI firmwares check_chroot_call(["mkdir", "-p", "{!s}/boot".format(efi_directory_firmware)]) - check_chroot_call(["cp", "{!s}/{!s}/grubx64.efi".format(efi_directory_firmware,efi_bootloader_id), "{!s}/boot/bootx64.efi".format(efi_directory_firmware)]) + check_chroot_call(["cp", "{!s}/{!s}/grubx64.efi".format(efi_directory_firmware, + efi_bootloader_id), + "{!s}/boot/bootx64.efi".format(efi_directory_firmware)]) else: install_path = boot_loader["installPath"] - check_chroot_call([libcalamares.job.configuration["grubInstall"], "--target=i386-pc", install_path]) + check_chroot_call( + [libcalamares.job.configuration["grubInstall"], "--target=i386-pc", + install_path]) - check_chroot_call([libcalamares.job.configuration["grubMkconfig"], "-o", libcalamares.job.configuration["grubCfg"]]) + check_chroot_call([libcalamares.job.configuration["grubMkconfig"], "-o", + libcalamares.job.configuration["grubCfg"]]) def run(): diff --git a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py index a63dc198c..c2e4c021f 100644 --- a/src/modules/grubcfg/main.py +++ b/src/modules/grubcfg/main.py @@ -3,27 +3,26 @@ # # === This file is part of Calamares - === # -# Copyright 2014 - 2015, Philip Müller +# Copyright 2014 - 2015, Philip Müller # -# Calamares is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# Calamares is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # -# Calamares is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# Calamares is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with Calamares. If not, see . +# You should have received a copy of the GNU General Public License +# along with Calamares. If not, see . import libcalamares import os def modify_grub_default(partitions, root_mount_point, distributor): - default_dir = os.path.join(root_mount_point, "etc/default") default_grub = os.path.join(default_dir, "grub") distributor_replace = distributor.replace("'", "'\\''") @@ -39,7 +38,7 @@ def modify_grub_default(partitions, root_mount_point, distributor): swap_uuid = partition["uuid"] if swap_uuid != "": - kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"resume=UUID={!s} quiet {!s}\"".format(swap_uuid,use_splash) + kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"resume=UUID={!s} quiet {!s}\"".format(swap_uuid, use_splash) else: kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"quiet {!s}\"".format(use_splash) @@ -81,7 +80,7 @@ def modify_grub_default(partitions, root_mount_point, distributor): escaped_value = "false" else: escaped_value = str(value).replace("'", "'\\''") - lines.append("{!s}=\"{!s}\"".format(key,escaped_value)) + lines.append("{!s}=\"{!s}\"".format(key, escaped_value)) if not have_kernel_cmd: lines.append(kernel_cmd) @@ -94,6 +93,7 @@ def modify_grub_default(partitions, root_mount_point, distributor): return None + def run(): partitions = libcalamares.globalstorage.value("partitions") root_mount_point = libcalamares.globalstorage.value("rootMountPoint") diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py index 90548cf34..738b9ae47 100644 --- a/src/modules/mount/main.py +++ b/src/modules/mount/main.py @@ -42,7 +42,7 @@ def mount_partitions(root_mount_point, partitions): mount_point, fstype, partition.get("options", "") - ) + ) def run():