applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-27 17:35:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[python modules] use str.format()

Browse source
This commit is contained in:
Philip Müller 2015-02-17 14:38:30 +01:00
parent 6906ba0b59
commit ca5132f13e
5 changed files with 45 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/modules/grubcfg/main.py
View file

@ -2,7 +2,7 @@
# encoding: utf-8
# === This file is part of Calamares - <http://github.com/calamares> ===
#
# Copyright 2014, Philip Müller <philm@manjaro.org>
# Copyright 2014 - 2015, Philip Müller <philm@manjaro.org>
#
# Calamares is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -25,6 +25,7 @@ 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("'", "'\\''")
plymouth_bin = os.path.join(root_mount_point, "usr/bin/plymouth")
use_splash = ""
swap_uuid = ""
@ -37,11 +38,11 @@ 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"' % (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"' % use_splash
kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"quiet {!s}\"".format(use_splash)
distributor_line = "GRUB_DISTRIBUTOR='%s'" % distributor.replace("'", "'\\''")
distributor_line = "GRUB_DISTRIBUTOR=\"{!s}\"".format(distributor_replace)
if not os.path.exists(default_dir):
os.mkdir(default_dir)
@ -79,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'" % (key, escaped_value))
lines.append("{!s}=\"{!s}\"".format(key,escaped_value))
if not have_kernel_cmd:
lines.append(kernel_cmd)