mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dont stop expiring versions if we cant check if the source file still exists 

instead continue assuming it still exists

Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2021-02-05 15:06:43 +01:00
parent 137636b651
commit b2fb4d898a
No known key found for this signature in database
GPG Key ID: 42B69D8A64526EFB
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/files_versions/lib/Storage.php
View File

@ -53,6 +53,7 @@ use OCA\Files_Versions\Command\Expire;
use OCA\Files_Versions\Events\CreateVersionEvent; use OCA\Files_Versions\Events\CreateVersionEvent;
use OCA\Files_Versions\Versions\IVersionManager; use OCA\Files_Versions\Versions\IVersionManager;
use OCP\Files\NotFoundException; use OCP\Files\NotFoundException;
use OCP\Files\StorageNotAvailableException;
use OCP\IUser; use OCP\IUser;
use OCP\Lock\ILockingProvider; use OCP\Lock\ILockingProvider;
use OCP\User; use OCP\User;
@ -724,8 +725,14 @@ class Storage {
\OC_Util::setupFS($uid); \OC_Util::setupFS($uid);
if (!Filesystem::file_exists($filename)) { try {
return false; if (!Filesystem::file_exists($filename)) {
return false;
}
} catch (StorageNotAvailableException $e) {
// if we can't check that the file hasn't been deleted we can only assume that it hasn't
// note that this `StorageNotAvailableException` is about the file the versions originate from,
// not the storage that the versions are stored on
} }
if (empty($filename)) { if (empty($filename)) {