FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TerraSync: better reporting of permissions failures removing files

Browse Source 
Log a ‘failed to remove orphan’ error as an error with the repository,
instead of failing the entire sync
This commit is contained in:
James Turner 2021-04-02 16:46:47 +01:00
parent ae920c6ebd
commit 5f026c840c
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
simgear/io/HTTPRepository.cxx
View File

@ -393,7 +393,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);
} }
@ -405,11 +410,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);
} }
} }
@ -771,7 +775,7 @@ private:
if (!ok) { if (!ok) {
SG_LOG(SG_TERRASYNC, SG_WARN, "removal failed for:" << path); SG_LOG(SG_TERRASYNC, SG_WARN, "removal failed for:" << path);
throw sg_io_exception("Failed to remove existing file/dir:", path); throw sg_io_exception("Failed to remove existing file/dir:", path, _repository->basePath.utf8Str(), false);
} }
} }