diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py index f066b8292..b246244f5 100644 --- a/src/modules/packages/main.py +++ b/src/modules/packages/main.py @@ -7,6 +7,7 @@ # Copyright 2015-2017, Teo Mrnjavac # Copyright 2016-2017, Kyle Robbertze # Copyright 2017, Alf Gaida +# Copyright 2018, Adriaan de Groot # # Calamares is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -394,9 +395,9 @@ def run_operations(pkgman, entry): try: pkgman.install_package(package) except subprocess.CalledProcessError: - warn_text = "WARNING: could not install package " + warn_text = "Could not install package " warn_text += str(package) - libcalamares.utils.debug(warn_text) + libcalamares.utils.warning(warn_text) elif key == "remove": _change_mode(REMOVE) pkgman.remove(entry[key]) @@ -406,9 +407,9 @@ def run_operations(pkgman, entry): try: pkgman.remove([package]) except subprocess.CalledProcessError: - warn_text = "WARNING: could not remove package " + warn_text = "Could not remove package " warn_text += package - libcalamares.utils.debug(warn_text) + libcalamares.utils.warning(warn_text) elif key == "localInstall": _change_mode(INSTALL) pkgman.install(entry[key], from_local=True) @@ -441,7 +442,7 @@ def run(): skip_this = libcalamares.job.configuration.get("skip_if_no_internet", False) if skip_this and not libcalamares.globalstorage.value("hasInternet"): - libcalamares.utils.debug( "WARNING: packages installation has been skipped: no internet" ) + libcalamares.utils.warning( "Package installation has been skipped: no internet" ) return None update_db = libcalamares.job.configuration.get("update_db", False) diff --git a/src/modules/umount/main.py b/src/modules/umount/main.py index 5a04796f6..7a796684a 100644 --- a/src/modules/umount/main.py +++ b/src/modules/umount/main.py @@ -5,6 +5,7 @@ # # Copyright 2014, Aurélien Gâteau # Copyright 2016, Anke Boersma +# Copyright 2018, Adriaan de Groot # # Calamares is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -65,7 +66,7 @@ def run(): try: shutil.copy2(log_source, log_destination) except Exception as e: - libcalamares.utils.debug("WARNING Could not preserve file {!s}, " + libcalamares.utils.warning("Could not preserve file {!s}, " "error {!s}".format(log_source, e)) if not root_mount_point: