applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-25 16:38:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[libcalamares] Log earlier, warnings--

Browse source
This commit is contained in:
Adriaan de Groot 2017-11-28 11:26:59 -05:00
parent 1e27c6438a
commit 9df796a3fd
1 changed files with 12 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/libcalamares/PythonHelper.cpp
View file

@ -247,8 +247,11 @@ Helper::createCleanNamespace()
QString QString
Helper::handleLastError() Helper::handleLastError()
{ {
PyObject* type = nullptr, *val = nullptr, *tb = nullptr; PyObject* type = nullptr, *val = nullptr, *traceback_p = nullptr;
PyErr_Fetch( &type, &val, &tb ); PyErr_Fetch( &type, &val, &traceback_p );
Logger::CDebug debug;
debug.noquote() << "Python Error:\n";
QString typeMsg; QString typeMsg;
if ( type != nullptr ) if ( type != nullptr )
@ -261,6 +264,7 @@ Helper::handleLastError()
if ( typeMsg.isEmpty() ) if ( typeMsg.isEmpty() )
typeMsg = tr( "Unknown exception type" ); typeMsg = tr( "Unknown exception type" );
debug << typeMsg << '\n';
} }
QString valMsg; QString valMsg;
@ -287,14 +291,15 @@ Helper::handleLastError()
if ( extractedOutput.check() ) if ( extractedOutput.check() )
valMsg.append( QString::fromStdString( extractedOutput() ) ); valMsg.append( QString::fromStdString( extractedOutput() ) );
} }
debug << valMsg << '\n';
} }
QString tbMsg; QString tbMsg;
if ( tb != nullptr ) if ( traceback_p != nullptr )
{ {
bp::handle<> h_tb( tb ); bp::handle<> h_tb( traceback_p );
bp::object tb( bp::import( "traceback" ) ); bp::object traceback_module( bp::import( "traceback" ) );
bp::object format_tb( tb.attr( "format_tb" ) ); bp::object format_tb( traceback_module.attr( "format_tb" ) );
bp::object tb_list( format_tb( h_tb ) ); bp::object tb_list( format_tb( h_tb ) );
bp::object pystr( bp::str( "\n" ).join( tb_list ) ); bp::object pystr( bp::str( "\n" ).join( tb_list ) );
bp::extract< std::string > extracted( pystr ); bp::extract< std::string > extracted( pystr );
@ -303,6 +308,7 @@ Helper::handleLastError()
if ( tbMsg.isEmpty() ) if ( tbMsg.isEmpty() )
tbMsg = tr( "unparseable Python traceback" ); tbMsg = tr( "unparseable Python traceback" );
debug << tbMsg << '\n';
} }
if ( typeMsg.isEmpty() && valMsg.isEmpty() && tbMsg.isEmpty() ) if ( typeMsg.isEmpty() && valMsg.isEmpty() && tbMsg.isEmpty() )
@ -310,27 +316,15 @@ Helper::handleLastError()
QStringList msgList; QStringList msgList;
Logger::CDebug debug;
debug.noquote() << "Python Error:\n";
if ( !typeMsg.isEmpty() ) if ( !typeMsg.isEmpty() )
{
debug << typeMsg << '\n';
msgList.append( QString( "<strong>%1</strong>" ).arg( typeMsg.toHtmlEscaped() ) ); msgList.append( QString( "<strong>%1</strong>" ).arg( typeMsg.toHtmlEscaped() ) );
}
if ( !valMsg.isEmpty() ) if ( !valMsg.isEmpty() )
{
debug << valMsg << '\n';
msgList.append( valMsg.toHtmlEscaped() ); msgList.append( valMsg.toHtmlEscaped() );
}
if ( !tbMsg.isEmpty() ) if ( !tbMsg.isEmpty() )
{ {
msgList.append( "Traceback:" ); msgList.append( "Traceback:" );
msgList.append( QString( "<pre>%1</pre>" ).arg( tbMsg.toHtmlEscaped() ) ); msgList.append( QString( "<pre>%1</pre>" ).arg( tbMsg.toHtmlEscaped() ) );
debug << tbMsg << '\n';
} }
// Return a string made of the msgList items, wrapped in <div> tags // Return a string made of the msgList items, wrapped in <div> tags