common/FileUtil.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
New commits: commit b30757417b73180bb02c0e3f20b194ece1516ea1 Author: Michael Meeks <[email protected]> AuthorDate: Wed Mar 25 17:43:36 2020 +0000 Commit: Andras Timar <[email protected]> CommitDate: Wed Mar 25 20:18:52 2020 +0100 jail removal - don't use flaky/experimental new C++ filesystem. Simply not removing jails on some systems. Change-Id: Idb1306fec83acebc61dec2e7a240ad89e7c91437 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91067 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Ashod Nakashian <[email protected]> diff --git a/common/FileUtil.cpp b/common/FileUtil.cpp index 84f4085a1..701ab28ec 100644 --- a/common/FileUtil.cpp +++ b/common/FileUtil.cpp @@ -236,7 +236,7 @@ namespace FileUtil } } -#if !HAVE_STD_FILESYSTEM +#if 1 // !HAVE_STD_FILESYSTEM static int nftw_cb(const char *fpath, const struct stat*, int type, struct FTW*) { if (type == FTW_DP) @@ -255,7 +255,9 @@ namespace FileUtil void removeFile(const std::string& path, const bool recursive) { -#if HAVE_STD_FILESYSTEM +// Amazingly filesystem::remove_all silently fails to work on some +// systems. No real need to be using experimental API here either. +#if 0 // HAVE_STD_FILESYSTEM std::error_code ec; if (recursive) filesystem::remove_all(path, ec); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
