From 7fdcbbe00e7df9bb1e4e9818d0fa6aff6c9a1d41 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sat, 8 Jan 2011 22:14:24 +0000 Subject: Fix reported store file name and reported side of local missing files. (merges [2740] from 0.11) --- bin/bbackupquery/BackupQueries.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'bin/bbackupquery') diff --git a/bin/bbackupquery/BackupQueries.cpp b/bin/bbackupquery/BackupQueries.cpp index bed28367..89371aba 100644 --- a/bin/bbackupquery/BackupQueries.cpp +++ b/bin/bbackupquery/BackupQueries.cpp @@ -2273,7 +2273,7 @@ void BackupQueries::Compare(int64_t DirID, const std::string &rStoreDir, for(std::set >::const_iterator i = storeDirs.begin(); i != storeDirs.end(); ++i) { std::string localPath(MakeFullPath(rLocalDir, i->first)); - std::string storePath(rLocalDir + "/" + i->first); + std::string storePath(rStoreDir + "/" + i->first); // Does the directory exist locally? string_set_iter_t local(localDirs.find(i->first)); @@ -2286,8 +2286,8 @@ void BackupQueries::Compare(int64_t DirID, const std::string &rStoreDir, else if(local == localDirs.end()) { // Not found -- report - rParams.NotifyRemoteFileMissing(localPath, - storePath, false); + rParams.NotifyLocalFileMissing(localPath, + storePath); } else if(rParams.IsExcludedDir(localPath)) { @@ -2297,8 +2297,7 @@ void BackupQueries::Compare(int64_t DirID, const std::string &rStoreDir, { // Compare directory Compare(i->second->GetObjectID(), - rStoreDir + "/" + i->first, - localPath, rParams); + storePath, localPath, rParams); // Remove from set so that we know it's been compared localDirs.erase(local); -- cgit v1.2.3