more reliable return value for Watcher::checkUpdate

Signed-off-by: Robin Appelman <robin@icewind.nl>

diff --git a/lib/private/Files/Cache/Watcher.php b/lib/private/Files/Cache/Watcher.php
index 19e17e6095986be84c2673209c422dc837f440c7..15e15f9f458abff957d5a12b61a413734b30cc03 100644 (file)
--- a/lib/private/Files/Cache/Watcher.php
+++ b/lib/private/Files/Cache/Watcher.php
@@ -89,7 +89,14 @@ class Watcher implements IWatcher {
                }
                if ($cachedEntry === false || $this->needsUpdate($path, $cachedEntry)) {
                        $this->update($path, $cachedEntry);
-                       return true;
+
+                       if ($cachedEntry === false) {
+                               return true;
+                       } else {
+                               // storage backends can sometimes return false positives, only return true if the scanner actually found a change
+                               $newEntry = $this->cache->get($path);
+                               return $newEntry->getStorageMTime() > $cachedEntry->getStorageMTime();
+                       }
                } else {
                        return false;
                }