MEN-7804 - handle no files in artifact #131
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
danielskinstad
force-pushed
the
no-file
branch
from
ee43856 to
b4efb25
Compare
lluiscampos
requested changes
Jan 31, 2025
danielskinstad
force-pushed
the
no-file
branch
4 times, most recently
from
f7aea99 to
3aeaa60
Compare
|
Didn't find a better/simpler way to check if the artifact had a file - lmk if you have a better solution |
danielskinstad
changed the title
vpodzime
reviewed
Feb 2, 2025
danielskinstad
force-pushed
the
no-file
branch
from
3aeaa60 to
fbf1f55
Compare
vpodzime
approved these changes
Feb 3, 2025
| @@ -136,6 +139,12 @@ mender_zephyr_image_set_pending_image(MENDER_NDEBUG_UNUSED mender_update_state_t | |||
| assert(MENDER_UPDATE_STATE_INSTALL == state); | |||
| mender_err_t ret; | |||
|
|
|||
| if (!artifact_has_payload) { | |||
| mender_log_error("No file in artifact"); | |||
There was a problem hiding this comment.
No payload in artifact, maybe?
| @@ -29,6 +29,8 @@ | |||
| */ | |||
| static void *mcu_boot_flash_handle = NULL; | |||
|
|
|||
| static bool artifact_has_payload; | |||
There was a problem hiding this comment.
I'd actually name this artifact_had_payload as that reflects that it's only valid after an artifact was processed.
Setting the update module when preparing the data is too late - and it can lead to unexpected behaviour in the state machine if the artifact doesn't contain files. Changelog: None Ticket: MEN-7804 Signed-off-by: Daniel Skinstad Drabitzius <[email protected]>
Check if the aritfact has a payload file by adding a boolean that's set when the download artifact flash callback is called. Ticket: MEN-7804 Signed-off-by: Daniel Skinstad Drabitzius <[email protected]>
danielskinstad
force-pushed
the
no-file
branch
from
fbf1f55 to
7e84363
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Due to
artifact_read_data_preparenot being called when an artifact doesn't have any files, the update module might be NULL aftermender_http_artifact_downloadreturns MENDER_OK.Add an explicit check to ensure this is caught.
Changelog: None
Ticket: MEN-7804