[Pkg-owncloud-commits] [owncloud-client] 90/219: Blacklist: ignore problems that don't have HTTP error code and are possibly problem on the local file system

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 79052ba7c696a73bd5eba7b006095186179b0848
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Fri Sep 12 14:11:33 2014 +0200

    Blacklist: ignore problems that don't have HTTP error code and are possibly problem on the local file system
    
    Issue #1985
---
 src/mirall/owncloudpropagator.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/mirall/owncloudpropagator.cpp b/src/mirall/owncloudpropagator.cpp
index 107d4e4..f9e9d36 100644
--- a/src/mirall/owncloudpropagator.cpp
+++ b/src/mirall/owncloudpropagator.cpp
@@ -84,13 +84,14 @@ void PropagateItemJob::done(SyncFileItem::Status status, const QString &errorStr
         // do not blacklist in case of soft error or fatal error.
         break;
     case SyncFileItem::NormalError:
+        if (_item._httpErrorCode == 0  // Do not blacklist local errors. (#1985)
 #ifdef OWNCLOUD_5XX_NO_BLACKLIST
-        if (_item._httpErrorCode / 100 == 5) {
-            // In this configuration, never blacklist error 5xx
-            qDebug() << "Do not blacklist error " << _item._httpErrorCode;
+            || _item._httpErrorCode / 100 == 5 // In this configuration, never blacklist error 5xx
+#endif
+                ) {
+            qDebug() << "This error is not blacklisted " << _item._httpErrorCode;
             break;
         }
-#endif
         _propagator->_journal->updateBlacklistEntry( record );
         break;
     case SyncFileItem::Success:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git