Skip to content

Commit

Permalink
Merge pull request #67 from ejoerns/v0/topic/fix-update_slots-step
Browse files Browse the repository at this point in the history
install: fix termination of `update_slots` step
  • Loading branch information
jluebbe committed Aug 23, 2016
2 parents ec55aac + a7fb62e commit c0257a7
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/install.c
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ static gboolean launch_and_wait_default_handler(RaucInstallArgs *args, gchar* bu
res = FALSE;
g_set_error_literal(error, R_HANDLER_ERROR, 0,
"Compatible mismatch");
goto out;
goto early_out;
}

/* Mark all parent destination slots non-bootable */
Expand All @@ -574,7 +574,7 @@ static gboolean launch_and_wait_default_handler(RaucInstallArgs *args, gchar* bu
if (!res) {
g_set_error(error, R_HANDLER_ERROR, 0,
"Failed marking slot %s non-bootable", dest_slot->name);
goto out;
goto early_out;
}
}

Expand Down Expand Up @@ -775,6 +775,7 @@ static gboolean launch_and_wait_default_handler(RaucInstallArgs *args, gchar* bu

out:
r_context_end_step("update_slots", res);
early_out:
return res;
}

Expand Down

0 comments on commit c0257a7

Please sign in to comment.