From 1b5ecb65aabe546cea51da1de7fad61ff1d32525 Mon Sep 17 00:00:00 2001 From: Daniel Girtler Date: Wed, 21 Jun 2023 17:47:30 +1000 Subject: Always verify permissions and check for log dir (#1874) Co-authored-by: Daniel Girtler --- archinstall/__init__.py | 7 +------ archinstall/lib/output.py | 6 +++++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/archinstall/__init__.py b/archinstall/__init__.py index ce58e255..305d4096 100644 --- a/archinstall/__init__.py +++ b/archinstall/__init__.py @@ -20,10 +20,7 @@ from . import default_profiles from .lib.hardware import SysInfo, AVAILABLE_GFX_DRIVERS from .lib.installer import Installer, accessibility_tools_in_use -from .lib.output import ( - FormattedOutput, log, error, - check_log_permissions, debug, warn, info -) +from .lib.output import FormattedOutput, log, error, debug, warn, info from .lib.storage import storage from .lib.global_menu import GlobalMenu from .lib.boot import Boot @@ -50,8 +47,6 @@ storage['__version__'] = __version__ # project to mark strings as translatable with _('translate me') DeferredTranslation.install() -check_log_permissions() - # Log various information about hardware before starting the installation. This might assist in troubleshooting debug(f"Hardware model detected: {SysInfo.sys_vendor()} {SysInfo.product_name()}; UEFI mode: {SysInfo.has_uefi()}") debug(f"Processor model detected: {SysInfo.cpu_model()}") diff --git a/archinstall/lib/output.py b/archinstall/lib/output.py index b406d624..d266afa8 100644 --- a/archinstall/lib/output.py +++ b/archinstall/lib/output.py @@ -135,7 +135,7 @@ class Journald: log_adapter.log(level, message) -def check_log_permissions(): +def _check_log_permissions(): filename = storage.get('LOG_FILE', None) log_dir = storage.get('LOG_PATH', Path('./')) @@ -292,6 +292,10 @@ def log( reset: bool = False, font: List[Font] = [] ): + # leave this check here as we need to setup the logging + # right from the beginning when the modules are loaded + _check_log_permissions() + text = orig_string = ' '.join([str(x) for x in msgs]) # Attempt to colorize the output if supported -- cgit v1.2.3-70-g09d2