From 3d6e31d36dcd7d3553a4399d7ef024bc3c904255 Mon Sep 17 00:00:00 2001 From: Marek Niepieklo Date: Thu, 17 Jun 2021 14:25:35 +0200 Subject: [PATCH] [CP-200] Revert Delete file with old OS version This reverts commit e6de85dbc19963e77144b192b9f40fbdc25a7e0d. --- .gitignore | 2 +- .../service-desktop/endpoints/update/UpdateMuditaOS.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2ef4416c4743a951f1bc2b9d6fbfb71003b1474b..ab398d523e06d514b8fe9667c266213e552e44bb 100644 --- a/.gitignore +++ b/.gitignore @@ -52,7 +52,7 @@ docker/assets/requirements* tags .ycm_extra_conf.py -./update/ +update/ # build in docker files .ccache/ diff --git a/module-services/service-desktop/endpoints/update/UpdateMuditaOS.cpp b/module-services/service-desktop/endpoints/update/UpdateMuditaOS.cpp index c9026ec8690c01d1e3174495c957844a64656952..c6b898cd4cce9d7a550bf482f9e8881b822660cf 100644 --- a/module-services/service-desktop/endpoints/update/UpdateMuditaOS.cpp +++ b/module-services/service-desktop/endpoints/update/UpdateMuditaOS.cpp @@ -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());