diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2020-03-25 17:43:36 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-03-25 21:40:27 +0100 |
| commit | 6f79be196c74ce33667b3c05c84a7d2a3b16c3f8 (patch) | |
| tree | e67bdcbe68d478578e17a1d77b7e9a75239e5733 | |
| parent | 3c2f7e0d60b230b573f81978a2917b63f631a064 (diff) | |
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 <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
(cherry picked from commit b30757417b73180bb02c0e3f20b194ece1516ea1)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90961
Reviewed-by: Andras Timar <andras.timar@collabora.com>
| -rw-r--r-- | common/FileUtil.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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); |