TerraSync: better reporting of permissions failures removing files
Log a ‘failed to remove orphan’ error as an error with the repository, instead of failing the entire sync
This commit is contained in:
committed by
James Turner
parent
a095ab684c
commit
e2caad3b0b
@@ -377,7 +377,12 @@ public:
|
|||||||
|
|
||||||
// We now have a list of entries that need to be updated, and a list
|
// We now have a list of entries that need to be updated, and a list
|
||||||
// of orphan files that should be removed.
|
// of orphan files that should be removed.
|
||||||
removeOrphans(orphans);
|
try {
|
||||||
|
removeOrphans(orphans);
|
||||||
|
} catch (sg_exception& e) {
|
||||||
|
_repository->failedToUpdateChild(_relativePath, HTTPRepository::ResultCode::REPO_ERROR_IO);
|
||||||
|
}
|
||||||
|
|
||||||
scheduleUpdates(toBeUpdated);
|
scheduleUpdates(toBeUpdated);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -389,11 +394,10 @@ public:
|
|||||||
|
|
||||||
void removeOrphans(const PathList orphans)
|
void removeOrphans(const PathList orphans)
|
||||||
{
|
{
|
||||||
PathList::const_iterator it;
|
for (const auto& o : orphans) {
|
||||||
for (it = orphans.begin(); it != orphans.end(); ++it) {
|
if (o.file() == ".dirindex") continue;
|
||||||
if (it->file() == ".dirindex") continue;
|
if (o.file() == ".hash") continue;
|
||||||
if (it->file() == ".hash") continue;
|
removeChild(o);
|
||||||
removeChild(*it);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user