~aleteoryx/muditaos

3d6e31d36dcd7d3553a4399d7ef024bc3c904255 — Marek Niepieklo 4 years ago 5b2881c
[CP-200] Revert Delete file with old OS version

This reverts commit e6de85dbc19963e77144b192b9f40fbdc25a7e0d.
2 files changed, 2 insertions(+), 3 deletions(-)

M .gitignore
M module-services/service-desktop/endpoints/update/UpdateMuditaOS.cpp
M .gitignore => .gitignore +1 -1
@@ 52,7 52,7 @@ docker/assets/requirements*
tags
.ycm_extra_conf.py

./update/
update/

# build in docker files
.ccache/

M module-services/service-desktop/endpoints/update/UpdateMuditaOS.cpp => module-services/service-desktop/endpoints/update/UpdateMuditaOS.cpp +1 -2
@@ 544,10 544,9 @@ updateos::UpdateError UpdateMuditaOS::cleanupAfterUpdate()

    try {
        mtar_close(&updateTar);
        if (!std::filesystem::remove(updateFile)) {
        if (std::remove(updateFile.c_str()) != 0) {
            return informError(updateos::UpdateError::CantRemoveUpdateFile, "Failed to delete %s", updateFile.c_str());
        }
        LOG_DEBUG("Deleted update file %s", updateFile.c_str());
    }
    catch (const std::filesystem::filesystem_error &fsError) {
        LOG_ERROR("remove_all on %s, error %s", updateFile.c_str(), fsError.what());