opensourcemirror
/
nextcloud-desktop
mirror of https://github.com/nextcloud/desktop.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #6568 from nextcloud/bugfix/defaultIgnorePatternsShouldBeCorrect 

use the proper name when reading system exclude config file
This commit is contained in:
Matthieu Gallien 2024-03-22 17:26:07 +01:00 committed by GitHub
parent 0312a1f398 634f007074
commit 38812ce6b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libsync/configfile.cpp
View File

@ -404,14 +404,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 {
@ -421,7 +421,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;
}
@ -433,7 +433,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();