mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-27 09:30:13 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #331 from nextcloud/upstream/pr/6412

Browse source 
Blacklisting must prevent parent etag updates #6411
This commit is contained in:
Roeland Jago Douma 2018-06-05 10:18:53 +02:00 committed by GitHub
commit 0afcb23734
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libsync/owncloudpropagator.cpp
View file

@ -834,10 +834,13 @@ void PropagatorCompositeJob::slotSubJobFinished(SyncFileItem::Status status)
ASSERT(i >= 0);
_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
|| status == SyncFileItem::NormalError
|| status == SyncFileItem::SoftError
|| status == SyncFileItem::DetailError) {
|| status == SyncFileItem::DetailError
|| status == SyncFileItem::BlacklistedError) {
_hasError = status;
}

5
src/libsync/syncfileitem.h
View file

@ -75,10 +75,9 @@ public:
/** For files whose errors were blacklisted
*
* 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
* should not cause the sync run to fail.
* errors should appear in the issues tab but should be silent otherwise.
*
* A DetailError that doesn't cause sync failure.
* A SoftError caused by blacklisting.
*/
BlacklistedError
};