From cb2f5a829e6791854433a1a39399ec1bc18f0b8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Thu, 9 Jul 2020 15:02:21 +0200 Subject: [PATCH 1/2] Do not exit if available space cannot be determined on file transfer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- apps/files/lib/Service/OwnershipTransferService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files/lib/Service/OwnershipTransferService.php b/apps/files/lib/Service/OwnershipTransferService.php index 535822b999..661f0d1043 100644 --- a/apps/files/lib/Service/OwnershipTransferService.php +++ b/apps/files/lib/Service/OwnershipTransferService.php @@ -194,7 +194,7 @@ class OwnershipTransferService { $output->writeln('Validating quota'); $size = $view->getFileInfo($sourcePath, false)->getSize(false); $freeSpace = $view->free_space($destinationUid . '/files/'); - if ($size > $freeSpace) { + if ($size > $freeSpace && $freeSpace !== -2) { $output->writeln('Target user does not have enough free space available.'); throw new \Exception('Execution terminated.'); } From 4e297d7a977c7129039246dfc9e78e882a5bf465 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Mon, 10 Aug 2020 15:45:03 +0200 Subject: [PATCH 2/2] Use constant instead of magic number Signed-off-by: Morris Jobke --- apps/files/lib/Service/OwnershipTransferService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files/lib/Service/OwnershipTransferService.php b/apps/files/lib/Service/OwnershipTransferService.php index 661f0d1043..b04a53919a 100644 --- a/apps/files/lib/Service/OwnershipTransferService.php +++ b/apps/files/lib/Service/OwnershipTransferService.php @@ -194,7 +194,7 @@ class OwnershipTransferService { $output->writeln('Validating quota'); $size = $view->getFileInfo($sourcePath, false)->getSize(false); $freeSpace = $view->free_space($destinationUid . '/files/'); - if ($size > $freeSpace && $freeSpace !== -2) { + if ($size > $freeSpace && $freeSpace !== FileInfo::SPACE_UNKNOWN) { $output->writeln('Target user does not have enough free space available.'); throw new \Exception('Execution terminated.'); }