Catch \Error in transfer:ownership

This makes the command more fault tolerant. An \Error can happen when e.g. the owner of a share is null. Signed-off-by: Tobia De Koninck <[email protected]>
nextcloud · Jul 17, 2019 · b72154a · b72154a
1 parent 32d3c6d
commit b72154a
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/apps/files/lib/Command/TransferOwnership.php b/apps/files/lib/Command/TransferOwnership.php
@@ -28,6 +28,7 @@
 
 namespace OCA\Files\Command;
 
+use Error;
 use OC\Files\Filesystem;
 use OC\Files\View;
 use OCP\Files\FileInfo;
@@ -298,7 +299,9 @@ private function restoreShares(OutputInterface $output) {
 			} catch (\OCP\Files\NotFoundException $e) {
 				$output->writeln('<error>Share with id ' . $share->getId() . ' points at deleted file, skipping</error>');
 			} catch (\Exception $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() . '\n' . $e->getTraceAsString() . '</error>');
+			} catch (\Error $e) {
+				$output->writeln('<error>Could not restore share with id ' . $share->getId() . ':' . $e->getMessage() . '\n' . $e->getTraceAsString() . '</error>');
 			}
 			$progress->advance();
 		}