From c67d285a8b213816395948c2082faaf6bb6eab43 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 7 Mar 2018 13:59:19 +0100 Subject: Intermediate dir may come into existence during osl_createDirectoryPath ...when some other entity creates it in parallel. This used to stop creating any subsequent sub-directories in the chain, and instead return a misleading osl_File_E_EXIST. I assume this is the underlying issue of the sporadic Jenkins "Daily Screenshot Build on Windows" failures. (After the previous attempt at getting at that, d15ff312ad80e4d1f210636e3374a81c14c229a2 "Normalize computation of directory and file-in-directory URLs", now failed for a different file after all, workdir/screenshots/modules/schart/ui/datarangedialog/DataRangeDialog.png during CppunitTest_chart2_dialogs_test.) Change-Id: I00ee67c1ef634c5390c677693e143c26266eeda7 Reviewed-on: https://gerrit.libreoffice.org/50892 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- sal/osl/unx/file_misc.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sal/osl/unx') diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx index 034ed56df5cb..7e3386cfa4e5 100644 --- a/sal/osl/unx/file_misc.cxx +++ b/sal/osl/unx/file_misc.cxx @@ -537,7 +537,7 @@ static oslFileError create_dir_recursively_( oslFileError osl_error = create_dir_recursively_( dir_path, aDirectoryCreationCallbackFunc, pData); - if (osl_error != osl_File_E_None) + if (osl_error != osl_File_E_None && osl_error != osl_File_E_EXIST) return osl_error; dir_path[pos] = '/'; -- cgit