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

[libcalamares] Improve warnings when module descriptor files are bad

Browse Source
This commit is contained in:
Adriaan de Groot 2019-06-18 12:06:13 +02:00
parent 5fdaeaa899
commit 34b1a250ba
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libcalamaresui/modulesystem/ModuleManager.cpp
View File

@ -90,10 +90,14 @@ ModuleManager::doInit()
if ( success )
{
QFileInfo descriptorFileInfo( currentDir.absoluteFilePath( QLatin1Literal( "module.desc") ) );
if ( ! ( descriptorFileInfo.exists() && descriptorFileInfo.isReadable() ) )
if ( !descriptorFileInfo.exists() )
{
cDebug() << Q_FUNC_INFO << "unreadable file: "
<< descriptorFileInfo.absoluteFilePath();
cDebug() << "ModuleManager expected descriptor is missing:" << descriptorFileInfo.absoluteFilePath();
continue;
}
if ( !descriptorFileInfo.isReadable() )
{
cDebug() << "ModuleManager descriptor file is unreadable:" << descriptorFileInfo.absoluteFilePath();
continue;
}
@ -111,13 +115,14 @@ ModuleManager::doInit()
}
else
{
cWarning() << "Cannot cd into module directory "
<< path << "/" << subdir;
cWarning() << "ModuleManager module directory is not accessible:" << path << "/" << subdir;
}
}
}
else
cDebug() << "ModuleManager bad search path" << path;
{
cDebug() << "ModuleManager module search path does not exist:" << path;
}
}
// At this point m_availableModules is filled with whatever was found in the
// search paths.