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

done soon
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2023-04-15 23:00:34 +02:00
parent 7bf880a29f
commit f2c71d962a
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bsp_q7s/core/CoreController.cpp
View File

@ -1066,10 +1066,11 @@ ReturnValue_t CoreController::actionListDirectoryDumpDirectly(ActionId_t actionI
return result; return result;
} }
segmentIdx++; segmentIdx++;
dumpedBytes += nextDumpLen;
} }
// Remove work file when we are done // Remove work file when we are done
std::filesystem::remove(LIST_DIR_DUMP_WORK_FILE, e); std::filesystem::remove(LIST_DIR_DUMP_WORK_FILE, e);
return returnvalue::OK; return EXECUTION_FINISHED;
} }
ReturnValue_t CoreController::actionListDirectoryIntoFile(ActionId_t actionId, ReturnValue_t CoreController::actionListDirectoryIntoFile(ActionId_t actionId,
@ -1112,7 +1113,7 @@ ReturnValue_t CoreController::actionListDirectoryIntoFile(ActionId_t actionId,
return returnvalue::FAILED; return returnvalue::FAILED;
} }
} }
return returnvalue::OK; return EXECUTION_FINISHED;
} }
ReturnValue_t CoreController::initBootCopyFile() { ReturnValue_t CoreController::initBootCopyFile() {
@ -2198,6 +2199,8 @@ ReturnValue_t CoreController::executeSwUpdate(SwUpdateSources sourceDir, const u
if (not exists(archivePath, e)) { if (not exists(archivePath, e)) {
return HasFileSystemIF::FILE_DOES_NOT_EXIST; return HasFileSystemIF::FILE_DOES_NOT_EXIST;
} }
// TODO: Decompressing without limiting memory usage with xz is actually a bit risky..
// But has not been an issue so far.
ostringstream cmd("tar -xJf", ios::app); ostringstream cmd("tar -xJf", ios::app);
cmd << " " << archivePath << " -C " << prefixPath; cmd << " " << archivePath << " -C " << prefixPath;
int result = system(cmd.str().c_str()); int result = system(cmd.str().c_str());