From 5a4e7ff1b67ea2139d996af5f0f22f2efac0f27d Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Tue, 18 Apr 2017 14:49:50 -0700 Subject: Workaround for fs::remove_all() --- toolsrc/src/vcpkg_Files.cpp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'toolsrc/src/vcpkg_Files.cpp') diff --git a/toolsrc/src/vcpkg_Files.cpp b/toolsrc/src/vcpkg_Files.cpp index d0e55a215..599c6f5ef 100644 --- a/toolsrc/src/vcpkg_Files.cpp +++ b/toolsrc/src/vcpkg_Files.cpp @@ -1,6 +1,7 @@ #include "pch.h" #include "vcpkg_Files.h" #include "vcpkg_System.h" +#include namespace vcpkg::Files { @@ -115,7 +116,22 @@ namespace vcpkg::Files } virtual std::uintmax_t remove_all(const fs::path & path, std::error_code& ec) override { - return fs::stdfs::remove_all(path, ec); + // Working around the currently buggy remove_all() + std::uintmax_t out = fs::stdfs::remove_all(path, ec); + + for (int i = 0; i < 5 && this->exists(path); i++) + { + using namespace std::chrono_literals; + std::this_thread::sleep_for(i * 100ms); + out += fs::stdfs::remove_all(path, ec); + } + + if (this->exists(path)) + { + System::println(System::Color::warning, "Some files in %s were unable to be removed. Close any editors operating in this directory and retry.", path.string()); + } + + return out; } virtual bool exists(const fs::path & path) const override { -- cgit v1.2.3