eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

Custom OBSW update path #582

Merged
muellerr merged 6 commits from feature_custom_obsw_update_path into develop 2023-04-11 16:12:43 +02:00
Conversation 1 Commits 6 Files Changed 2 +19 -90
7 changed files with 19 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit af9f346698 - Show all commits

5
bsp_q7s/core/CoreController.cpp
View File

@@ -1891,6 +1891,7 @@ ReturnValue_t CoreController::executeSwUpdate(SwUpdateSources sourceDir, const u
size_t size) { size_t size) {
using namespace std; using namespace std;
using namespace std::filesystem; using namespace std::filesystem;
error_code e;
// At the very least, chip and copy ID need to be included in the command // At the very least, chip and copy ID need to be included in the command
if (size < 2) { if (size < 2) {
return HasActionsIF::INVALID_PARAMETERS; return HasActionsIF::INVALID_PARAMETERS;
@@ -2020,8 +2021,8 @@ ReturnValue_t CoreController::executeSwUpdate(SwUpdateSources sourceDir, const u
cmd.clear(); cmd.clear();
// Remove the extracted files to keep directories clean. // Remove the extracted files to keep directories clean.
meggert commented 2023-04-11 09:16:47 +02:00
Outdated
Review
Copy Link

use bool remove( const std::filesystem::path& p, std::error_code& ec ) noexcept; instead

use `bool remove( const std::filesystem::path& p, std::error_code& ec ) noexcept;` instead
std::filesystem::remove(strippedImagePath); std::filesystem::remove(strippedImagePath, e);
meggert commented 2023-04-11 09:17:12 +02:00
Outdated
Review
Copy Link

use bool remove( const std::filesystem::path& p, std::error_code& ec ) noexcept; instead

use `bool remove( const std::filesystem::path& p, std::error_code& ec ) noexcept;` instead
std::filesystem::remove(obswVersionFilePath); std::filesystem::remove(obswVersionFilePath, e);
// TODO: This takes a long time and will block the core controller.. Maybe use command executor? // TODO: This takes a long time and will block the core controller.. Maybe use command executor?
// For now dont care.. // For now dont care..