1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add the error output for syncqt normilizedPath function

Browse Source 
Task-number: QTBUG-123438
Pick-to: 6.6 6.5
Change-Id: If718d774daac2fd4a9e27ad4725a74362d1c78f3
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 7aecb189d544613ad13c7e7d1207bd7767225a71)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexey Edelev 2024-03-18 16:58:55 +01:00 committed by Qt Cherry-pick Bot
parent 539c6b6f76
commit 1e3c0e4395
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/tools/syncqt/main.cpp
View File

@ -136,17 +136,24 @@ void printInternalError()
<< std::endl;
}
std::filesystem::path normilizedPath(const std::string &path)
{
return std::filesystem::path(std::filesystem::weakly_canonical(path).generic_string());
}
void printFilesystemError(const std::filesystem::filesystem_error &fserr, std::string_view errorMsg)
{
std::cerr << errorMsg << ": " << fserr.path1() << ".\n"
<< fserr.what() << "(" << fserr.code().value() << ")" << std::endl;
}
std::filesystem::path normilizedPath(const std::string &path)
{
try {
auto result = std::filesystem::path(std::filesystem::weakly_canonical(path).generic_string());
return result;
} catch (const std::filesystem::filesystem_error &fserr) {
printFilesystemError(fserr, "Unable to normalize path");
throw;
}
return {};
}
bool createDirectories(const std::string &path, std::string_view errorMsg, bool *exists = nullptr)
{
bool result = true;