summaryrefslogtreecommitdiff
path: root/bin/bbackupquery
diff options
context:
space:
mode:
authorChris Wilson <chris+github@qwirx.com>2011-01-08 22:14:24 +0000
committerChris Wilson <chris+github@qwirx.com>2011-01-08 22:14:24 +0000
commit7fdcbbe00e7df9bb1e4e9818d0fa6aff6c9a1d41 (patch)
treeee865185f2d6e3c520fc74d9e053aa6885b04d7e /bin/bbackupquery
parent2f2f3882ce78c791faec5f42caf93eb2da2284ea (diff)
Fix reported store file name and reported side of local missing files.
(merges [2740] from 0.11)
Diffstat (limited to 'bin/bbackupquery')
-rw-r--r--bin/bbackupquery/BackupQueries.cpp9
1 files changed, 4 insertions, 5 deletions
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<std::pair<std::string, BackupStoreDirectory::Entry *> >::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);