sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Catch avatar export separately for better failure tracing 

Signed-off-by: Christopher Ng <chrng8@gmail.com>
pull/31969/head
Christopher Ng 2022-04-13 17:02:25 +07:00
parent 78c8e57896
commit 0924271abe
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
Unescape Escape 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);
}
}