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

[libcalamaresui] Drop the 'goodbye' message

Browse Source
This commit is contained in:
Adriaan de Groot 2018-06-11 13:35:12 -04:00
parent a732ce11bc
commit 35124c149e
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/libcalamaresui/modulesystem/ModuleManager.cpp
View File

@ -177,8 +177,6 @@ static int findCustomInstance( const Settings::InstanceDescriptionList& customIn
void void
ModuleManager::loadModules() ModuleManager::loadModules()
{ {
static const char GOODBYE[] = "\nCalamares will now quit.";
QTimer::singleShot( 0, this, [ this ]() QTimer::singleShot( 0, this, [ this ]()
{ {
QStringList failedModules; QStringList failedModules;
@ -200,8 +198,7 @@ ModuleManager::loadModules()
if ( moduleEntrySplit.length() < 1 || if ( moduleEntrySplit.length() < 1 ||
moduleEntrySplit.length() > 2 ) moduleEntrySplit.length() > 2 )
{ {
cError() << "Wrong module entry format for module" << moduleEntry << '.' cError() << "Wrong module entry format for module" << moduleEntry;
<< GOODBYE;
failedModules.append( moduleEntry ); failedModules.append( moduleEntry );
continue; continue;
} }
@ -213,8 +210,7 @@ ModuleManager::loadModules()
m_availableDescriptorsByModuleName.value( moduleName ).isEmpty() ) m_availableDescriptorsByModuleName.value( moduleName ).isEmpty() )
{ {
cError() << "Module" << moduleName << "not found in module search paths." cError() << "Module" << moduleName << "not found in module search paths."
<< Logger::DebugList( m_paths ) << Logger::DebugList( m_paths );
<< GOODBYE;
failedModules.append( moduleName ); failedModules.append( moduleName );
continue; continue;
} }
@ -227,8 +223,7 @@ ModuleManager::loadModules()
} }
else //ought to be a custom instance, but cannot find instance entry else //ought to be a custom instance, but cannot find instance entry
{ {
cError() << "Custom instance" << moduleEntry << "not found in custom instances section." cError() << "Custom instance" << moduleEntry << "not found in custom instances section.";
<< GOODBYE;
failedModules.append( moduleEntry ); failedModules.append( moduleEntry );
continue; continue;
} }
@ -250,8 +245,7 @@ ModuleManager::loadModules()
m_loadedModulesByInstanceKey.value( instanceKey, nullptr ); m_loadedModulesByInstanceKey.value( instanceKey, nullptr );
if ( thisModule && !thisModule->isLoaded() ) if ( thisModule && !thisModule->isLoaded() )
{ {
cError() << "Module" << instanceKey << "exists but not loaded." cError() << "Module" << instanceKey << "exists but not loaded.";
<< GOODBYE;
failedModules.append( instanceKey ); failedModules.append( instanceKey );
continue; continue;
} }
@ -269,8 +263,7 @@ ModuleManager::loadModules()
m_moduleDirectoriesByModuleName.value( moduleName ) ); m_moduleDirectoriesByModuleName.value( moduleName ) );
if ( !thisModule ) if ( !thisModule )
{ {
cError() << "Module" << instanceKey << "cannot be created from descriptor" << configFileName cError() << "Module" << instanceKey << "cannot be created from descriptor" << configFileName;
<< GOODBYE;
failedModules.append( instanceKey ); failedModules.append( instanceKey );
continue; continue;
} }
@ -279,8 +272,7 @@ ModuleManager::loadModules()
m_loadedModulesByInstanceKey.insert( instanceKey, thisModule ); m_loadedModulesByInstanceKey.insert( instanceKey, thisModule );
if ( !thisModule->isLoaded() ) if ( !thisModule->isLoaded() )
{ {
cError() << "Module" << instanceKey << "loading FAILED" cError() << "Module" << instanceKey << "loading FAILED.";
<< GOODBYE;
failedModules.append( instanceKey ); failedModules.append( instanceKey );
continue; continue;
} }