mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-29 00:26:33 +03:00
Merge pull request #331 from nextcloud/upstream/pr/6412
Blacklisting must prevent parent etag updates #6411
This commit is contained in:
commit
0afcb23734
2 changed files with 6 additions and 4 deletions
|
@ -834,10 +834,13 @@ void PropagatorCompositeJob::slotSubJobFinished(SyncFileItem::Status status)
|
||||||
ASSERT(i >= 0);
|
ASSERT(i >= 0);
|
||||||
_runningJobs.remove(i);
|
_runningJobs.remove(i);
|
||||||
|
|
||||||
|
// Any sub job error will cause the whole composite to fail. This is important
|
||||||
|
// for knowing whether to update the etag in PropagateDirectory, for example.
|
||||||
if (status == SyncFileItem::FatalError
|
if (status == SyncFileItem::FatalError
|
||||||
|| status == SyncFileItem::NormalError
|
|| status == SyncFileItem::NormalError
|
||||||
|| status == SyncFileItem::SoftError
|
|| status == SyncFileItem::SoftError
|
||||||
|| status == SyncFileItem::DetailError) {
|
|| status == SyncFileItem::DetailError
|
||||||
|
|| status == SyncFileItem::BlacklistedError) {
|
||||||
_hasError = status;
|
_hasError = status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -75,10 +75,9 @@ public:
|
||||||
/** For files whose errors were blacklisted
|
/** For files whose errors were blacklisted
|
||||||
*
|
*
|
||||||
* If an file is blacklisted due to an error it isn't even reattempted. These
|
* If an file is blacklisted due to an error it isn't even reattempted. These
|
||||||
* errors should appear in the issues tab, but not on the account settings and
|
* errors should appear in the issues tab but should be silent otherwise.
|
||||||
* should not cause the sync run to fail.
|
|
||||||
*
|
*
|
||||||
* A DetailError that doesn't cause sync failure.
|
* A SoftError caused by blacklisting.
|
||||||
*/
|
*/
|
||||||
BlacklistedError
|
BlacklistedError
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue