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

When looking for plugins in a search dir, make sure the path is correct

Browse Source
This commit is contained in:
Teo Mrnjavac 2014-06-24 16:27:23 +02:00
parent 869483055c
commit c23d198923
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calamares/ModuleLoader.cpp
View File

@ -70,8 +70,9 @@ ModuleLoader::doWork()
QStringList subdirs = currentDir.entryList( QDir::AllDirs | QDir::NoDotAndDotDot ); QStringList subdirs = currentDir.entryList( QDir::AllDirs | QDir::NoDotAndDotDot );
foreach ( const QString& subdir, subdirs ) foreach ( const QString& subdir, subdirs )
{ {
currentDir.setPath( path );
bool success = currentDir.cd( subdir ); bool success = currentDir.cd( subdir );
if ( success && currentDir.isReadable() ) if ( success )
{ {
QFileInfo metadataFileInfo( currentDir.absoluteFilePath( MODULE_CONFIG_FILENAME ) ); QFileInfo metadataFileInfo( currentDir.absoluteFilePath( MODULE_CONFIG_FILENAME ) );
if ( ! ( metadataFileInfo.exists() && metadataFileInfo.isReadable() ) ) if ( ! ( metadataFileInfo.exists() && metadataFileInfo.isReadable() ) )
@ -89,8 +90,6 @@ ModuleLoader::doWork()
{ {
m_availableModules.insert( moduleInfo->name(), moduleInfo ); m_availableModules.insert( moduleInfo->name(), moduleInfo );
} }
currentDir.cdUp();
} }
else else
{ {