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

Merge pull request #732 from siduction/pep8-hwclock

Browse Source 
Fixed pep8 whining in module hwclock
This commit is contained in:
adriaandegroot 2017-06-04 11:09:15 +02:00 committed by GitHub
commit c19ae0e247
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/hwclock/main.py
View File

@ -5,6 +5,7 @@
# #
# Copyright 2014 - 2015, Philip Müller <philm@manjaro.org> # Copyright 2014 - 2015, Philip Müller <philm@manjaro.org>
# Copyright 2014, Teo Mrnjavac <teo@kde.org> # Copyright 2014, Teo Mrnjavac <teo@kde.org>
# Copyright 2017. Alf Gaida <agaida@siduction.org>
# #
# Calamares is free software: you can redistribute it and/or modify # Calamares is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -26,13 +27,18 @@ import libcalamares
def run(): def run():
""" Set hardware clock """ """
Set hardware clock
"""
root_mount_point = libcalamares.globalstorage.value("rootMountPoint") root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
try: try:
subprocess.check_call(["hwclock", "--systohc", "--utc"]) subprocess.check_call(["hwclock", "--systohc", "--utc"])
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
return "Cannot set hardware clock.", "hwclock terminated with exit code {}.".format(e.returncode) return (
"Cannot set hardware clock.",
"hwclock terminated with exit code {}.".format(e.returncode)
)
shutil.copy2("/etc/adjtime", "{!s}/etc/".format(root_mount_point)) shutil.copy2("/etc/adjtime", "{!s}/etc/".format(root_mount_point))