From 032b33f56f20c2cc7080ba240e2905e14e901384 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 4 Apr 2018 11:25:28 -0400 Subject: [PATCH] [libcalamaresui] Improve logging. - Put the (constant) 'Calamares will now quit' on its own debug line. - Tell the user what the search paths are if a module is not found (prompted by a mis-configuration in a Neon live image). --- src/libcalamaresui/modulesystem/ModuleManager.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/libcalamaresui/modulesystem/ModuleManager.cpp b/src/libcalamaresui/modulesystem/ModuleManager.cpp index 60b9b2ce9..7afe5eef8 100644 --- a/src/libcalamaresui/modulesystem/ModuleManager.cpp +++ b/src/libcalamaresui/modulesystem/ModuleManager.cpp @@ -200,8 +200,8 @@ ModuleManager::loadModules() if ( moduleEntrySplit.length() < 1 || moduleEntrySplit.length() > 2 ) { - cError() << "Wrong module entry format for module" << moduleEntry << "." - << "\nCalamares will now quit."; + cError() << "Wrong module entry format for module" << moduleEntry << '.'; + cError() << "Calamares will now quit."; qApp->exit( 1 ); return; } @@ -213,7 +213,8 @@ ModuleManager::loadModules() m_availableDescriptorsByModuleName.value( moduleName ).isEmpty() ) { cError() << "Module" << moduleName << "not found in module search paths." - << "\nCalamares will now quit."; + << Logger::DebugList( m_paths ); + cError() << "Calamares will now quit."; qApp->exit( 1 ); return; } @@ -240,8 +241,8 @@ ModuleManager::loadModules() } else //ought to be a custom instance, but cannot find instance entry { - cError() << "Custom instance" << moduleEntry << "not found in custom instances section." - << "\nCalamares will now quit."; + cError() << "Custom instance" << moduleEntry << "not found in custom instances section."; + cError() << "Calamares will now quit."; qApp->exit( 1 ); return; }