upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-13 18:50:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge pull request #31969 from nextcloud/fix/user_migration-use-exceptions

Browse source 
Catch avatar export separately for better failure tracing
This commit is contained in:
Pytal 2022-04-13 10:58:41 -07:00 committed by GitHub
commit 3ebf7d045a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/settings/lib/UserMigration/AccountMigrator.php
View file

@ -77,7 +77,11 @@ class AccountMigrator implements IMigrator {
try {
$account = $this->accountManager->getAccount($user);
$exportDestination->addFileContents(AccountMigrator::PATH_ACCOUNT_FILE, json_encode($account));
} catch (Throwable $e) {
throw new AccountMigratorException('Could not export account information', 0, $e);
}
try {
$avatar = $this->avatarManager->getAvatar($user->getUID());
if ($avatar->isCustomAvatar()) {
$avatarFile = $avatar->getFile(-1);
@ -87,7 +91,7 @@ class AccountMigrator implements IMigrator {
$exportDestination->addFileAsStream($exportPath, $avatarFile->read());
}
} catch (Throwable $e) {
throw new AccountMigratorException('Could not export account information', 0, $e);
throw new AccountMigratorException('Could not export avatar', 0, $e);
}
}