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

[PEP8] fix several modules

Browse Source
This commit is contained in:
Philip 2017-06-23 11:59:45 +02:00
parent cf1c4bd7ae
commit 09f11a4091
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/mhwdcfg/main.py
View File

@ -30,7 +30,10 @@ class MhwdController:
def __init__(self): def __init__(self):
self.__root = libcalamares.globalstorage.value("rootMountPoint") self.__root = libcalamares.globalstorage.value("rootMountPoint")
self.__bus = libcalamares.job.configuration.get('bus', []) self.__bus = libcalamares.job.configuration.get('bus', [])
self.__identifier = libcalamares.job.configuration.get('identifier', []) self.__identifier = libcalamares.job.configuration.get(
'identifier',
[]
)
self.__local = libcalamares.job.configuration['local'] self.__local = libcalamares.job.configuration['local']
self.__repo = libcalamares.job.configuration['repo'] self.__repo = libcalamares.job.configuration['repo']
self._driver = libcalamares.job.configuration['driver'] self._driver = libcalamares.job.configuration['driver']

3
src/modules/postcfg/main.py
View File

@ -86,7 +86,8 @@ class ConfigController:
self.terminate('gpg-agent') self.terminate('gpg-agent')
# Update grub.cfg # Update grub.cfg
if exists(join(self.root, "usr/bin/update-grub")) and libcalamares.globalstorage.value("bootLoader") is not None: if exists(join(self.root, "usr/bin/update-grub")) \
and libcalamares.globalstorage.value("bootLoader") is not None:
target_env_call(["update-grub"]) target_env_call(["update-grub"])
return None return None

8
src/modules/services/main.py
View File

@ -69,7 +69,7 @@ def run():
if ec != 0: if ec != 0:
if tgt['mandatory']: if tgt['mandatory']:
return ("Cannot enable systemd target {}".format(tgt['name']), return ("Cannot enable systemd target {}".format(tgt['name']),
"systemctl enable call in chroot returned error code" "systemctl enable call in chroot returned error code "
"{}".format(ec) "{}".format(ec)
) )
else: else:
@ -90,7 +90,7 @@ def run():
if dbl['mandatory']: if dbl['mandatory']:
return ("Cannot disable systemd service" return ("Cannot disable systemd service"
"{}".format(dbl['name']), "{}".format(dbl['name']),
"systemctl disable call in chroot returned error code" "systemctl disable call in chroot returned error code "
"{}".format(ec)) "{}".format(ec))
else: else:
libcalamares.utils.debug( libcalamares.utils.debug(
@ -112,14 +112,14 @@ def run():
if ec != 0: if ec != 0:
return "Cannot enable systemd service {}".format(dm), \ return "Cannot enable systemd service {}".format(dm), \
"systemctl enable call in chroot returned error code" "systemctl enable call in chroot returned error code " \
"{}".format(ec) "{}".format(ec)
else: else:
libcalamares.utils.debug( libcalamares.utils.debug(
"Cannot enable systemd service {}".format(dm) "Cannot enable systemd service {}".format(dm)
) )
libcalamares.utils.debug( libcalamares.utils.debug(
"systemctl enable call in chroot returned error code" "systemctl enable call in chroot returned error code "
"{}".format(ec) "{}".format(ec)
) )