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

[calamares] Always run module tester with verbose logging

Browse Source
This commit is contained in:
Adriaan de Groot 2019-08-03 21:29:28 +02:00
parent 042852218f
commit 2fd2e90bf0
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/calamares/testmain.cpp
View File

@ -51,13 +51,14 @@ struct ModuleConfig
QString m_jobConfig; QString m_jobConfig;
QString m_globalConfig; QString m_globalConfig;
QString m_language; QString m_language;
QString m_branding;
}; };
static ModuleConfig static ModuleConfig
handle_args( QCoreApplication& a ) handle_args( QCoreApplication& a )
{ {
QCommandLineOption debugLevelOption( QCommandLineOption debugLevelOption(
QStringLiteral( "D" ), "Verbose output for debugging purposes (0-8).", "level" ); QStringLiteral( "D" ), "Verbose output for debugging purposes (0-8), ignored.", "level" );
QCommandLineOption globalOption( QStringList() << QStringLiteral( "g" ) << QStringLiteral( "global " ), QCommandLineOption globalOption( QStringList() << QStringLiteral( "g" ) << QStringLiteral( "global " ),
QStringLiteral( "Global settings document" ), QStringLiteral( "Global settings document" ),
"global.yaml" ); "global.yaml" );
@ -82,21 +83,7 @@ handle_args( QCoreApplication& a )
parser.process( a ); parser.process( a );
if ( parser.isSet( debugLevelOption ) ) Logger::setupLogLevel( Logger::LOGVERBOSE );
{
bool ok = true;
unsigned int l = parser.value( debugLevelOption ).toUInt( &ok );
unsigned int dlevel = 0;
if ( !ok )
{
dlevel = Logger::LOGVERBOSE;
}
else
{
dlevel = l;
}
Logger::setupLogLevel( dlevel );
}
const QStringList args = parser.positionalArguments(); const QStringList args = parser.positionalArguments();
if ( args.isEmpty() ) if ( args.isEmpty() )