[Pkg-owncloud-commits] [owncloud-client] 372/470: owncloudcmd: Save the selective sync list on the first run

[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 7a82fac0d5670201fffc58c3737c9ff950db9fce
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Thu Apr 21 12:52:05 2016 +0200

    owncloudcmd: Save the selective sync list on the first run
    
    For issue #4690
    
    In the first run, the journal might not exist, we should not cancel
    setting the selective sync list
---
 doc/owncloudcmd.rst | 2 +-
 src/cmd/cmd.cpp     | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/doc/owncloudcmd.rst b/doc/owncloudcmd.rst
index a813366..bd707ed 100644
--- a/doc/owncloudcmd.rst
+++ b/doc/owncloudcmd.rst
@@ -49,7 +49,7 @@ Other command line switches supported by ``owncloudcmd`` include the following:
       Exclude list file
 
 ``--unsyncedfolders [file]``
-      File containing the list of unsynced folders (selective sync)
+      File containing the list of unsynced remote folders (selective sync)
 
 ``--max-sync-retries [n]``
       Retries maximum n times (defaults to 3)
diff --git a/src/cmd/cmd.cpp b/src/cmd/cmd.cpp
index 79c02c2..ab26a42 100644
--- a/src/cmd/cmd.cpp
+++ b/src/cmd/cmd.cpp
@@ -153,7 +153,7 @@ void help()
     std::cout << "                         Proxy is http://server:port" << std::endl;
     std::cout << "  --trust                Trust the SSL certification." << std::endl;
     std::cout << "  --exclude [file]       Exclude list file" << std::endl;
-    std::cout << "  --unsyncedfolders [file]    File containing the list of unsynced folders (selective sync)" << std::endl;
+    std::cout << "  --unsyncedfolders [file]    File containing the list of unsynced remote folders (selective sync)" << std::endl;
     std::cout << "  --user, -u [name]      Use [name] as the login name" << std::endl;
     std::cout << "  --password, -p [pass]  Use [pass] as password" << std::endl;
     std::cout << "  -n                     Use netrc (5) for login" << std::endl;
@@ -249,10 +249,6 @@ void parseOptions( const QStringList& app_args, CmdOptions *options )
  */
 void selectiveSyncFixup(OCC::SyncJournalDb *journal, const QStringList &newList)
 {
-    if (!journal->exists()) {
-        return;
-    }
-
     SqlDatabase db;
     if (!db.openOrCreateReadWrite(journal->databaseFilePath())) {
         return;

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