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

[calamares] Tighten debug-output from module-loader test executable

Browse Source
This commit is contained in:
Adriaan de Groot 2021-06-15 21:23:57 +02:00
parent 7b297a0e16
commit 69cad09a00
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calamares/testmain.cpp
View File

@ -321,7 +321,7 @@ load_module( const ModuleConfig& moduleConfig )
QString configFile( moduleConfig.configFile().isEmpty() ? moduleDirectory + '/' + name + ".conf" QString configFile( moduleConfig.configFile().isEmpty() ? moduleDirectory + '/' + name + ".conf"
: moduleConfig.configFile() ); : moduleConfig.configFile() );
cDebug() << "Module" << moduleName << "job-configuration:" << configFile; cDebug() << Logger::SubEntry << "Module" << moduleName << "job-configuration:" << configFile;
Calamares::Module* module = Calamares::moduleFromDescriptor( Calamares::Module* module = Calamares::moduleFromDescriptor(
Calamares::ModuleSystem::Descriptor::fromDescriptorData( descriptor ), name, configFile, moduleDirectory ); Calamares::ModuleSystem::Descriptor::fromDescriptorData( descriptor ), name, configFile, moduleDirectory );
@ -406,7 +406,7 @@ main( int argc, char* argv[] )
return 1; return 1;
} }
cDebug() << " .. got" << m->name() << m->typeString() << m->interfaceString(); cDebug() << Logger::SubEntry << " .. got" << m->name() << m->typeString() << m->interfaceString();
if ( m->type() == Calamares::Module::Type::View ) if ( m->type() == Calamares::Module::Type::View )
{ {
// If we forgot the --ui, any ViewModule will core dump as it // If we forgot the --ui, any ViewModule will core dump as it
@ -455,7 +455,6 @@ main( int argc, char* argv[] )
cDebug() << "Module metadata" << TR( "name", m->name() ) << TR( "type", m->typeString() ) cDebug() << "Module metadata" << TR( "name", m->name() ) << TR( "type", m->typeString() )
<< TR( "interface", m->interfaceString() ); << TR( "interface", m->interfaceString() );
cDebug() << "Job outputs:";
Calamares::JobList jobList = m->jobs(); Calamares::JobList jobList = m->jobs();
unsigned int failure_count = 0; unsigned int failure_count = 0;
unsigned int count = 1; unsigned int count = 1;