mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-29 17:14:33 +00:00
15 lines
820 B
Diff
15 lines
820 B
Diff
|
Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
|
||
|
===================================================================
|
||
|
--- akonadi-17.04.0.orig/src/server/storage/dbconfigmysql.cpp
|
||
|
+++ akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
|
||
|
@@ -229,8 +229,7 @@ bool DbConfigMysql::startInternalServer(
|
||
|
bool confUpdate = false;
|
||
|
QFile actualFile(actualConfig);
|
||
|
// update conf only if either global (or local) is newer than actual
|
||
|
- if ((QFileInfo(globalConfig).lastModified() > QFileInfo(actualFile).lastModified()) ||
|
||
|
- (QFileInfo(localConfig).lastModified() > QFileInfo(actualFile).lastModified())) {
|
||
|
+ if (true) {
|
||
|
QFile globalFile(globalConfig);
|
||
|
QFile localFile(localConfig);
|
||
|
if (globalFile.open(QFile::ReadOnly) && actualFile.open(QFile::WriteOnly)) {
|