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

[libcalamares] When logging extra lines to warning or error, suppress label

Browse Source 
Avoid logs like

23:29:57 [2]: void Config::setConfigurationMap(const QVariantMap&)
    WARNING: Configuration for *initialSwapChoice* is not one of the *userSwapChoices*
WARNING:    .. Choice "small" added.

where the label is duplicated.
This commit is contained in:
Adriaan de Groot 2022-01-31 23:27:35 +01:00
parent 51f67f6c3e
commit 80300e412c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libcalamares/utils/Logger.h
View File

@ -71,8 +71,11 @@ private:
inline CDebug& inline CDebug&
operator<<( CDebug&& s, const FuncSuppressor& f ) operator<<( CDebug&& s, const FuncSuppressor& f )
{ {
s.m_funcinfo = nullptr; if ( s.m_funcinfo )
s << f.m_s; {
s.m_funcinfo = nullptr;
s.m_msg = QString( f.m_s );
}
return s; return s;
} }