applications/calamares
3
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-02-23 18:35:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #222 from Gormogon/master

Browse source 
Small Python IO Cleanup
This commit is contained in:
Teo Mrnjavac 2015-06-14 03:35:47 +02:00
commit 1e5e44e01b
2 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/modules/bootloader/main.py
View file

@ -106,7 +106,6 @@ def create_systemd_boot_conf(uuid, conf_path, kernel_line):
with open(conf_path, 'w') as f:
for l in lines:
f.write(l)
f.close()
def create_loader(loader_path):
@ -126,7 +125,6 @@ def create_loader(loader_path):
with open(loader_path, 'w') as f:
for l in lines:
f.write(l)
f.close()
def install_systemd_boot(efi_directory):

18
src/modules/unpackfs/main.py
View file

@ -264,18 +264,14 @@ def run():
fs_is_supported = False
if os.path.isfile(PATH_PROCFS) and os.access(PATH_PROCFS, os.R_OK):
procfile = open(PATH_PROCFS, 'r')
filesystems = procfile.read()
procfile.close()
with open(PATH_PROCFS, 'r') as procfile:
filesystems = procfile.read()
filesystems = filesystems.replace("nodev", "").replace("\t", "").splitlines()
filesystems = filesystems.replace("nodev", "")
filesystems = filesystems.replace("\t", "")
filesystems = filesystems.splitlines()
# Check if the source filesystem is supported
for fs in filesystems:
if fs == sourcefs:
fs_is_supported = True
# Check if the source filesystem is supported
for fs in filesystems:
if fs == sourcefs:
fs_is_supported = True
if not fs_is_supported:
return "Bad filesystem", "sourcefs=\"{}\"".format(sourcefs)