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

[libcalamares] Refactor to reduce compiler warnings

Browse Source
This commit is contained in:
Adriaan de Groot 2017-11-29 08:49:44 -05:00
parent 93ab6432c4
commit 12369abaa4
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/libcalamares/PythonHelper.cpp
View File

@ -183,6 +183,16 @@ variantHashFromPyDict( const boost::python::dict& pyDict )
Helper* Helper::s_instance = nullptr; Helper* Helper::s_instance = nullptr;
static inline void add_if_lib_exists( const QDir& dir, const char* name, QStringList& list )
{
if ( ! ( dir.exists() && dir.isReadable() ) )
return;
QFileInfo fi( dir.absoluteFilePath( name ) );
if ( fi.exists() && fi.isReadable() )
list.append( fi.dir().absolutePath() );
}
Helper::Helper( QObject* parent ) Helper::Helper( QObject* parent )
: QObject( parent ) : QObject( parent )
{ {
@ -196,20 +206,11 @@ Helper::Helper( QObject* parent )
m_mainNamespace = m_mainModule.attr( "__dict__" ); m_mainNamespace = m_mainModule.attr( "__dict__" );
// If we're running from the build dir // If we're running from the build dir
QFileInfo fi( QDir::current().absoluteFilePath( "libcalamares.so" ) ); add_if_lib_exists( QDir::current(), "libcalamares.so", m_pythonPaths );
if ( fi.exists() && fi.isReadable() )
m_pythonPaths.append( fi.dir().absolutePath() );
QDir calaPythonPath( CalamaresUtils::systemLibDir().absolutePath() + QDir calaPythonPath( CalamaresUtils::systemLibDir().absolutePath() +
QDir::separator() + "calamares" ); QDir::separator() + "calamares" );
if ( calaPythonPath.exists() && add_if_lib_exists( calaPythonPath, "libcalamares.so", m_pythonPaths );
calaPythonPath.isReadable() )
{
QFileInfo fi( calaPythonPath.absoluteFilePath( "libcalamares.so" ) );
if ( fi.exists() && fi.isReadable() )
m_pythonPaths.append( fi.dir().absolutePath() );
}
bp::object sys = bp::import( "sys" ); bp::object sys = bp::import( "sys" );