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

[calamares] Restore missing search paths

Browse Source 
- Misplaced {} makes the branding search path empty
 - Reported by @apachelogger
This commit is contained in:
Adriaan de Groot 2018-07-05 12:01:44 +02:00
parent b0e55c059a
commit f899bda81d
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calamares/CalamaresApplication.cpp
View File

@ -181,13 +181,10 @@ brandingFileCandidates( bool assumeBuilddir, const QString& brandingFilename )
else else
{ {
if ( assumeBuilddir ) if ( assumeBuilddir )
{
brandingPaths << ( QDir::currentPath() + QStringLiteral( "/src/" ) + brandingFilename ); brandingPaths << ( QDir::currentPath() + QStringLiteral( "/src/" ) + brandingFilename );
brandingPaths << QDir( CMAKE_INSTALL_FULL_SYSCONFDIR "/calamares/" ) brandingPaths << QDir( CMAKE_INSTALL_FULL_SYSCONFDIR "/calamares/" ).absoluteFilePath( brandingFilename );
.absoluteFilePath( brandingFilename );
brandingPaths << CalamaresUtils::appDataDir().absoluteFilePath( brandingFilename); brandingPaths << CalamaresUtils::appDataDir().absoluteFilePath( brandingFilename);
} }
}
return brandingPaths; return brandingPaths;
} }