Browse Source

Catch \Error in Transfer::restoreShares

This makes the command more fault tolerant. An \Error can happen when
e.g. the owner of a share is null.
If we don't catch this, the restore process will stop in an unknown
state.

Signed-off-by: Tobia De Koninck <LEDfan@users.noreply.github.com>
pull/19233/head
Tobia De Koninck 6 years ago
committed by Roeland Jago Douma
parent
commit
055ae9b2cd
No known key found for this signature in database GPG Key ID: F941078878347C0C
  1. 2
      apps/files/lib/Service/OwnershipTransferService.php

2
apps/files/lib/Service/OwnershipTransferService.php

@ -286,7 +286,7 @@ class OwnershipTransferService {
}
} catch (\OCP\Files\NotFoundException $e) {
$output->writeln('<error>Share with id ' . $share->getId() . ' points at deleted file, skipping</error>');
} catch (\Exception $e) {
} catch (\Throwable $e) {
$output->writeln('<error>Could not restore share with id ' . $share->getId() . ':' . $e->getTraceAsString() . '</error>');
}
$progress->advance();

Loading…
Cancel
Save