[Pkg-owncloud-commits] [owncloud-client] 357/470: SocketAPI: Display a warning on the directory if there are errors

[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 bd37eab3ad6ceb47670a5cc47ae39af6f8f9162f
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Tue Apr 19 18:18:00 2016 +0200

    SocketAPI: Display a warning on the directory if there are errors
    
    Errors with individual files within a directory now result in
    a warning label on the parent directories.
---
 src/libsync/syncfilestatustracker.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/libsync/syncfilestatustracker.cpp b/src/libsync/syncfilestatustracker.cpp
index a2df3bc..5a9e1bb 100644
--- a/src/libsync/syncfilestatustracker.cpp
+++ b/src/libsync/syncfilestatustracker.cpp
@@ -106,10 +106,9 @@ SyncFileStatus SyncFileStatusTracker::rootStatus()
             }
         }
         if( errs ) {
-            status = SyncFileStatus::StatusError;
-        } else if( warns ) {
-            status = SyncFileStatus::StatusWarning;
+            status = SyncFileStatus::StatusWarning; // some files underneath had errors
         }
+        // Only warnings do not change the root emblem away from ok.
     }
     return status;
 

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