lobo/isync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve error messages about irrecoverably changed UIDVALIDITY

Browse Source 
don't print the actual values, which are meaningless technicalities
to the average user, and can be obtained separately for debugging if
really necessary.
also, fix the omission of the affected mailboxes from one of the
messages.
This commit is contained in:
Oswald Buddenhagen 2021-02-20 22:52:01 +01:00
parent 95a83c8220
commit 6796e041ae
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/sync.c
View File

@ -1366,10 +1366,8 @@ box_opened2( sync_vars_t *svars, int t )
if (svars->uidval[t] != UIDVAL_BAD && svars->uidval[t] != svars->newuidval[t]) if (svars->uidval[t] != UIDVAL_BAD && svars->uidval[t] != svars->newuidval[t])
fails++; fails++;
if (fails == 2) { if (fails == 2) {
error( "Error: channel %s: UIDVALIDITY of both far and near side changed\n" error( "Error: channel %s: UIDVALIDITY of both far side %s and near side %s changed.\n",
"(far side got %u, expected %u; near side got %u, expected %u).\n", svars->chan->name, svars->orig_name[F], svars->orig_name[N]);
svars->chan->name,
svars->newuidval[F], svars->uidval[F], svars->newuidval[N], svars->uidval[N] );
bail: bail:
svars->ret = SYNC_FAIL; svars->ret = SYNC_FAIL;
sync_bail( svars ); sync_bail( svars );
@ -1617,10 +1615,8 @@ box_loaded( int sts, message_t *msgs, int total_msgs, int recent_msgs, void *aux
// A proper fallback would be fetching more headers (which potentially need // A proper fallback would be fetching more headers (which potentially need
// normalization) or the message body (which should be truncated for sanity) // normalization) or the message body (which should be truncated for sanity)
// and comparing. // and comparing.
error( "Error: channel %s, %s box %s: Unable to recover from UIDVALIDITY change\n" error( "Error: channel %s, %s box %s: Unable to recover from UIDVALIDITY change.\n",
"(got %u, expected %u).\n", svars->chan->name, str_fn[t], svars->orig_name[t] );
svars->chan->name, str_fn[t], svars->orig_name[t],
svars->newuidval[t], svars->uidval[t] );
goto uvchg; goto uvchg;
} }
notice( "Notice: channel %s, %s box %s: Recovered from change of UIDVALIDITY.\n", notice( "Notice: channel %s, %s box %s: Recovered from change of UIDVALIDITY.\n",