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

[keyboard] Improve debug-logging for vconsole-config

Browse Source
This commit is contained in:
Adriaan de Groot 2020-11-04 16:16:28 +01:00
parent 845fb3f6da
commit 57da222c72
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/keyboard/SetKeyboardLayoutJob.cpp
View File

@ -179,6 +179,8 @@ SetKeyboardLayoutJob::findLegacyKeymap() const
bool bool
SetKeyboardLayoutJob::writeVConsoleData( const QString& vconsoleConfPath, const QString& convertedKeymapPath ) const SetKeyboardLayoutJob::writeVConsoleData( const QString& vconsoleConfPath, const QString& convertedKeymapPath ) const
{ {
cDebug() << "Writing vconsole data to" << vconsoleConfPath;
QString keymap = findConvertedKeymap( convertedKeymapPath ); QString keymap = findConvertedKeymap( convertedKeymapPath );
if ( keymap.isEmpty() ) if ( keymap.isEmpty() )
{ {
@ -205,6 +207,7 @@ SetKeyboardLayoutJob::writeVConsoleData( const QString& vconsoleConfPath, const
file.close(); file.close();
if ( stream.status() != QTextStream::Ok ) if ( stream.status() != QTextStream::Ok )
{ {
cError() << "Could not read lines from" << file.fileName();
return false; return false;
} }
} }
@ -217,7 +220,7 @@ SetKeyboardLayoutJob::writeVConsoleData( const QString& vconsoleConfPath, const
} }
QTextStream stream( &file ); QTextStream stream( &file );
bool found = false; bool found = false;
foreach ( const QString& existingLine, existingLines ) for( const QString& existingLine : qAsConst( existingLines ) )
{ {
if ( existingLine.trimmed().startsWith( "KEYMAP=" ) ) if ( existingLine.trimmed().startsWith( "KEYMAP=" ) )
{ {
@ -237,7 +240,7 @@ SetKeyboardLayoutJob::writeVConsoleData( const QString& vconsoleConfPath, const
stream.flush(); stream.flush();
file.close(); file.close();
cDebug() << "Written KEYMAP=" << keymap << "to vconsole.conf"; cDebug() << Logger::SubEntry << "Written KEYMAP=" << keymap << "to vconsole.conf" << stream.status();
return ( stream.status() == QTextStream::Ok ); return ( stream.status() == QTextStream::Ok );
} }
@ -352,7 +355,6 @@ SetKeyboardLayoutJob::exec()
convertedKeymapPath = destDir.absoluteFilePath( convertedKeymapPath ); convertedKeymapPath = destDir.absoluteFilePath( convertedKeymapPath );
} }
cDebug() << "Writing VCONSOLE data to" << vconsoleConfPath << convertedKeymapPath;
if ( !writeVConsoleData( vconsoleConfPath, convertedKeymapPath ) ) if ( !writeVConsoleData( vconsoleConfPath, convertedKeymapPath ) )
{ {
return Calamares::JobResult::error( tr( "Failed to write keyboard configuration for the virtual console." ), return Calamares::JobResult::error( tr( "Failed to write keyboard configuration for the virtual console." ),