3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PresetUpdater - exceptions reformatted, not throwing an exception

Browse Source 
on Linux when changing file attributes, as changing file attributes
may fail when writing onto FAT file system, which does not support
some of the common Unix file attributes.
This commit is contained in:
Vojtech Bubnik 2020-12-14 11:05:12 +01:00
parent 0f11ff8525
commit 57ba953b2e
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/slic3r/Utils/PresetUpdater.cpp
View File

@ -65,17 +65,32 @@ void copy_file_fix(const fs::path& source, const fs::path& target,const std::str
boost::system::error_code ec; boost::system::error_code ec;
if (fs::exists(target)) { if (fs::exists(target)) {
fs::permissions(target, perms, ec); fs::permissions(target, perms, ec);
if(ec) if (ec) {
throw Slic3r::CriticalException((boost::format(_utf8(L("Copying of file %1% to %2% failed. Permissions fail at target file before copying.\nError message : %3%\n This error happend during %4% phase."))) % source % target % ec.message() % caller_function_name).str()); std::string msg = GUI::format(
_L("Copying of file %1% to %2% failed. Permissions fail at target file before copying.\n"
"Error message : %3%\n This error happend during %4% phase."),
source, target, ec.message(), caller_function_name);
#if defined(__APPLE__) || defined(_WIN32)
throw Slic3r::CriticalException(msg);
#else
BOOST_LOG_TRIVIAL(debug) << msg;
#endif
}
} }
ec.clear(); ec.clear();
fs::copy_file(source, target, fs::copy_option::overwrite_if_exists, ec); fs::copy_file(source, target, fs::copy_option::overwrite_if_exists, ec);
if (ec) if (ec)
throw Slic3r::CriticalException((boost::format(_utf8(L("Copying of file %1% to %2% failed.\nError message : %3%\n Copying was triggered by function: %4%"))) % source % target % ec.message() % caller_function_name).str()); throw Slic3r::CriticalException(GUI::format(
_L("Copying of file %1% to %2% failed.\n"
"Error message : %3%\nCopying was triggered by function: %4%"),
source, target, ec.message(), caller_function_name));
ec.clear(); ec.clear();
fs::permissions(target, perms, ec); fs::permissions(target, perms, ec);
if (ec) if (ec)
throw Slic3r::CriticalException((boost::format(_utf8(L("Copying of file %1% to %2% failed. Permissions fail at target file after copying.\nError message : %3%\n Copying was triggered by function: %4%"))) % source % target % ec.message() % caller_function_name).str()); throw Slic3r::CriticalException(GUI::format(
_L("Copying of file %1% to %2% failed. Permissions fail at target file after copying.\n"
"Error message : %3%\nCopying was triggered by function: %4%"),
source, target, ec.message(), caller_function_name));
} }
struct Update struct Update