Merge pull request #28578 from nextcloud/backport/28574/stable20

Pytal · web-flow · commit ab63c2e3d6ff · 2021-08-24T17:59:31.000-07:00
[stable20] Log exception message during failed ownership transfer share restore
diff --git a/apps/files/lib/Service/OwnershipTransferService.php b/apps/files/lib/Service/OwnershipTransferService.php
@@ -351,7 +351,7 @@ private function restoreShares(string $sourceUid,
 			} catch (\OCP\Files\NotFoundException $e) {
 				$output->writeln('<error>Share with id ' . $share->getId() . ' points at deleted file, skipping</error>');
 			} catch (\Throwable $e) {
-				$output->writeln('<error>Could not restore share with id ' . $share->getId() . ':' . $e->getTraceAsString() . '</error>');
+				$output->writeln('<error>Could not restore share with id ' . $share->getId() . ':' . $e->getMessage() . ' : ' . $e->getTraceAsString() . '</error>');
 			}
 			$progress->advance();
 		}

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ private function restoreShares(string $sourceUid,`
`351`	`351`	`} catch (\OCP\Files\NotFoundException $e) {`
`352`	`352`	`$output->writeln('<error>Share with id ' . $share->getId() . ' points at deleted file, skipping</error>');`
`353`	`353`	`} catch (\Throwable $e) {`
`354`		`- $output->writeln('<error>Could not restore share with id ' . $share->getId() . ':' . $e->getTraceAsString() . '</error>');`
	`354`	`+ $output->writeln('<error>Could not restore share with id ' . $share->getId() . ':' . $e->getMessage() . ' : ' . $e->getTraceAsString() . '</error>');`
`355`	`355`	`}`
`356`	`356`	`$progress->advance();`
`357`	`357`	`}`