Merge pull request #21775 from nextcloud/bugfix/noid/transfer-object-storage

MorrisJobke · web-flow · commit 5d3ecfdffdf9 · 2020-08-11T11:08:03.000+02:00
Do not exit if available space cannot be determined on file transfer
diff --git a/apps/files/lib/Service/OwnershipTransferService.php b/apps/files/lib/Service/OwnershipTransferService.php
@@ -194,7 +194,7 @@ protected function analyse(string $sourceUid,
 		$output->writeln('Validating quota');
 		$size = $view->getFileInfo($sourcePath, false)->getSize(false);
 		$freeSpace = $view->free_space($destinationUid . '/files/');
-		if ($size > $freeSpace) {
+		if ($size > $freeSpace && $freeSpace !== FileInfo::SPACE_UNKNOWN) {
 			$output->writeln('<error>Target user does not have enough free space available.</error>');
 			throw new \Exception('Execution terminated.');
 		}

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ protected function analyse(string $sourceUid,`
`194`	`194`	`$output->writeln('Validating quota');`
`195`	`195`	`$size = $view->getFileInfo($sourcePath, false)->getSize(false);`
`196`	`196`	`$freeSpace = $view->free_space($destinationUid . '/files/');`
`197`		`- if ($size > $freeSpace) {`
	`197`	`+ if ($size > $freeSpace && $freeSpace !== FileInfo::SPACE_UNKNOWN) {`
`198`	`198`	`$output->writeln('<error>Target user does not have enough free space available.</error>');`
`199`	`199`	`throw new \Exception('Execution terminated.');`
`200`	`200`	`}`