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>distro/collabora/co-4-2-2
parent
ff7db2b229
commit
b30757417b
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue