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

[libcalamares] Use -D for just debug-level setting

Browse Source 
- Original flag -d sets debugging but also changes behavior
 - New -D just sets debugging
 - Simplify QStringList (use C++ 11)
This commit is contained in:
Adriaan de Groot 2018-02-12 09:57:12 -05:00
parent ae5511c2f3
commit 79d81700b3
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/calamares/main.cpp
View File

@ -63,11 +63,14 @@ main( int argc, char* argv[] )
parser.setApplicationDescription( "Distribution-independent installer framework" ); parser.setApplicationDescription( "Distribution-independent installer framework" );
parser.addHelpOption(); parser.addHelpOption();
parser.addVersionOption(); parser.addVersionOption();
QCommandLineOption debugOption( QStringList() << "d" << "debug", QCommandLineOption debugOption( QStringList{ "d", "debug"},
"Verbose output for debugging purposes." ); "Also look in current directory for configuration. Implies -D." );
parser.addOption( debugOption ); parser.addOption( debugOption );
QCommandLineOption configOption( QStringList() << "c" << "config", parser.addOption( QCommandLineOption( QStringLiteral("D"),
"Verbose output for debugging purposes." ) );
QCommandLineOption configOption( QStringList{ "c", "config"},
"Configuration directory to use, for testing purposes.", "config" ); "Configuration directory to use, for testing purposes.", "config" );
parser.addOption( configOption ); parser.addOption( configOption );

3
src/libcalamares/utils/Logger.cpp
View File

@ -47,7 +47,8 @@ log( const char* msg, unsigned int debugLevel, bool toDisk = true )
if ( !s_threshold ) if ( !s_threshold )
{ {
if ( qApp->arguments().contains( "--debug" ) || if ( qApp->arguments().contains( "--debug" ) ||
qApp->arguments().contains( "-d" ) ) qApp->arguments().contains( "-d" ) ||
qApp->arguments().contains( "-D" ) )
s_threshold = LOGVERBOSE; s_threshold = LOGVERBOSE;
else else
#ifdef QT_NO_DEBUG #ifdef QT_NO_DEBUG