Skip to content

Commit

Permalink
use the proper name when reading system exclude config file
Browse files Browse the repository at this point in the history
Close #6539

Signed-off-by: Matthieu Gallien <[email protected]>
  • Loading branch information
mgallien authored and backportbot[bot] committed Mar 27, 2024
1 parent b846740 commit 941489c
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/libsync/configfile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -406,14 +406,14 @@ QString ConfigFile::excludeFileFromSystem()
{
QFileInfo fi;
#ifdef Q_OS_WIN
fi.setFile(QCoreApplication::applicationDirPath(), exclFile);
fi.setFile(QCoreApplication::applicationDirPath(), syncExclFile);
#endif
#ifdef Q_OS_UNIX
fi.setFile(QString(SYSCONFDIR "/" + Theme::instance()->appName()), exclFile);
fi.setFile(QString(SYSCONFDIR "/" + Theme::instance()->appName()), syncExclFile);
if (!fi.exists()) {
// Prefer to return the preferred path! Only use the fallback location
// if the other path does not exist and the fallback is valid.
QFileInfo nextToBinary(QCoreApplication::applicationDirPath(), exclFile);
QFileInfo nextToBinary(QCoreApplication::applicationDirPath(), syncExclFile);
if (nextToBinary.exists()) {
fi = nextToBinary;
} else {
Expand All @@ -423,7 +423,7 @@ QString ConfigFile::excludeFileFromSystem()
d.cdUp(); // go out of usr
if (!d.isRoot()) { // it is really a mountpoint
if (d.cd("etc") && d.cd(Theme::instance()->appName())) {
QFileInfo inMountDir(d, exclFile);
QFileInfo inMountDir(d, syncExclFile);
if (inMountDir.exists()) {
fi = inMountDir;
}
Expand All @@ -435,7 +435,7 @@ QString ConfigFile::excludeFileFromSystem()
#ifdef Q_OS_MAC
// exec path is inside the bundle
fi.setFile(QCoreApplication::applicationDirPath(),
QLatin1String("../Resources/") + exclFile);
QLatin1String("../Resources/") + syncExclFile);
#endif

return fi.absoluteFilePath();
Expand Down

0 comments on commit 941489c

Please sign in to comment.