From 5df651aa7028d8ee71aed75b37c199b288df540e Mon Sep 17 00:00:00 2001 From: Martin Date: Fri, 19 Apr 2019 12:27:57 +0200 Subject: [PATCH] Revert "Revert "New setting to make backup dirs optional per default"" This reverts commit 5629a644b2ee63640fb31d50d13c64633b6ec1e0. --- urbackupclient/RestoreFiles.cpp | 3 ++- urbackupclient/client.cpp | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/urbackupclient/RestoreFiles.cpp b/urbackupclient/RestoreFiles.cpp index ad9684eb..b98ebb55 100644 --- a/urbackupclient/RestoreFiles.cpp +++ b/urbackupclient/RestoreFiles.cpp @@ -373,8 +373,9 @@ void RestoreFiles::operator()() return; } + bool backup_dirs_optional; IndexThread::readPatterns(tgroup, clientsubname, exclude_dirs, - include_dirs); + include_dirs, backup_dirs_optional); std::map open_files; if (restore_flags & restore_flag_open_all_files_first) diff --git a/urbackupclient/client.cpp b/urbackupclient/client.cpp index 0bd08582..efaf0a1c 100644 --- a/urbackupclient/client.cpp +++ b/urbackupclient/client.cpp @@ -3519,6 +3519,8 @@ std::string IndexThread::sanitizePattern(const std::string &p) void IndexThread::readPatterns(int index_group, std::string index_clientsubname, std::vector& exclude_dirs, std::vector& include_dirs) { + backup_dirs_optional = false; + std::string exclude_pattern_key = "exclude_files"; std::string include_pattern_key = "include_files";