Skip to content

Commit

Permalink
Merge pull request #1348 from ejoerns/load-manifest-in-error
Browse files Browse the repository at this point in the history
src/bundle: prefix manifest load errors with hint on manifest
  • Loading branch information
jluebbe committed Feb 26, 2024
2 parents 099670f + 09cb467 commit def5885
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions src/bundle.c
Original file line number Diff line number Diff line change
Expand Up @@ -896,7 +896,8 @@ gboolean create_bundle(const gchar *bundlename, const gchar *contentdir, GError

res = load_manifest_file(manifestpath, &manifest, &ierror);
if (!res) {
g_propagate_error(error, ierror);
g_propagate_prefixed_error(error, ierror,
"Failed to load manifest: ");
goto out;
}

Expand Down Expand Up @@ -1126,7 +1127,8 @@ static gboolean convert_to_casync_bundle(RaucBundle *bundle, const gchar *outbun
/* Load manifest from content/ dir */
res = load_manifest_file(mfpath, &manifest, &ierror);
if (!res) {
g_propagate_error(error, ierror);
g_propagate_prefixed_error(error, ierror,
"Failed to load manifest: ");
goto out;
}

Expand Down Expand Up @@ -2219,7 +2221,8 @@ gboolean replace_signature(RaucBundle *bundle, const gchar *insig, const gchar *
} else {
res = load_manifest_from_bundle(bundle, &loaded_manifest, &ierror);
if (!res) {
g_propagate_error(error, ierror);
g_propagate_prefixed_error(error, ierror,
"Failed to load manifest: ");
goto out;
}
manifest = loaded_manifest;
Expand Down

0 comments on commit def5885

Please sign in to comment.