applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-29 02:15:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into requirements-checking

Browse source
This commit is contained in:
Adriaan de Groot 2018-03-06 17:06:35 +01:00
commit c7629182e4
229 changed files with 20045 additions and 6562 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/libcalamaresui/modulesystem/ModuleManager.cpp
View file

@ -116,7 +116,7 @@ ModuleManager::doInit()
}
catch ( YAML::Exception& e )
{
cDebug() << "WARNING: YAML parser error " << e.what();
cWarning() << "YAML parser error " << e.what();
continue;
}
}
@ -140,7 +140,7 @@ ModuleManager::doInit()
}
else
{
cDebug() << Q_FUNC_INFO << "cannot cd into module directory "
cWarning() << "Cannot cd into module directory "
<< path << "/" << subdir;
}
}
@ -197,7 +197,7 @@ ModuleManager::loadModules()
if ( moduleEntrySplit.length() < 1 ||
moduleEntrySplit.length() > 2 )
{
cDebug() << "Wrong module entry format for module" << moduleEntry << "."
cError() << "Wrong module entry format for module" << moduleEntry << "."
<< "\nCalamares will now quit.";
qApp->exit( 1 );
return;
@ -209,7 +209,7 @@ ModuleManager::loadModules()
if ( !m_availableDescriptorsByModuleName.contains( moduleName ) ||
m_availableDescriptorsByModuleName.value( moduleName ).isEmpty() )
{
cDebug() << "Module" << moduleName << "not found in module search paths."
cError() << "Module" << moduleName << "not found in module search paths."
<< "\nCalamares will now quit.";
qApp->exit( 1 );
return;
@ -237,7 +237,7 @@ ModuleManager::loadModules()
}
else //ought to be a custom instance, but cannot find instance entry
{
cDebug() << "Custom instance" << moduleEntry << "not found in custom instances section."
cError() << "Custom instance" << moduleEntry << "not found in custom instances section."
<< "\nCalamares will now quit.";
qApp->exit( 1 );
return;
@ -260,7 +260,7 @@ ModuleManager::loadModules()
m_loadedModulesByInstanceKey.value( instanceKey, nullptr );
if ( thisModule && !thisModule->isLoaded() )
{
cDebug() << "Module" << instanceKey << "exists but not loaded."
cError() << "Module" << instanceKey << "exists but not loaded."
<< "\nCalamares will now quit.";
qApp->exit( 1 );
return;
@ -279,7 +279,7 @@ ModuleManager::loadModules()
m_moduleDirectoriesByModuleName.value( moduleName ) );
if ( !thisModule )
{
cDebug() << "Module" << instanceKey << "cannot be created from descriptor.";
cWarning() << "Module" << instanceKey << "cannot be created from descriptor.";
Q_ASSERT( thisModule );
continue;
}
@ -289,7 +289,7 @@ ModuleManager::loadModules()
Q_ASSERT( thisModule->isLoaded() );
if ( !thisModule->isLoaded() )
{
cDebug() << "Module" << moduleName << "loading FAILED";
cWarning() << "Module" << moduleName << "loading FAILED";
continue;
}
}