From: vsr Date: Tue, 5 Mar 2019 06:37:39 +0000 (+0300) Subject: Merge branch 'V9_2_2_BR' into V9_2_BR X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5977087dc3d3fc669d669e636fef8f2c24fbe544;p=modules%2Fkernel.git Merge branch 'V9_2_2_BR' into V9_2_BR --- 5977087dc3d3fc669d669e636fef8f2c24fbe544 diff --cc src/Container/Container_i.cxx index d34b36ba8,92db1e0ad..61f7fd177 --- a/src/Container/Container_i.cxx +++ b/src/Container/Container_i.cxx @@@ -1853,8 -1853,8 +1853,8 @@@ void Engines_Container_i::clearTemporar { std::list::const_iterator it; for ( it = _tmp_files.begin(); it != _tmp_files.end(); ++it ) { -#ifdef WIN32 +#ifdef WIN32 - std::string command = "del /F /P"; + std::string command = (GetFileAttributes((*it).c_str()) == FILE_ATTRIBUTE_DIRECTORY) ? "rd /Q \"" : "del /F /Q \""; #else std::string command = "rm -rf "; #endif