Skip to content

Commit

Permalink
Merge pull request #36 from ejoerns/v0/topic/progress-fixes
Browse files Browse the repository at this point in the history
progress step fixes
  • Loading branch information
jluebbe committed Apr 21, 2016
2 parents dbbbd07 + 16a4b33 commit 62d048e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/install.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,8 @@ gboolean determine_slot_states(GError **error) {

g_assert_nonnull(r_context()->config);

r_context_begin_step("determine_slot_states", "Determining slot states", 0);

if (r_context()->config->slots == NULL) {
g_set_error_literal(
error,
Expand All @@ -145,8 +147,6 @@ gboolean determine_slot_states(GError **error) {
}
g_assert_nonnull(r_context()->config->slots);

r_context_begin_step("determine_slot_states", "Determining slot states", 0);

/* Determine active slot mount points */
mountlist = g_unix_mounts_get(NULL);
for (GList *l = mountlist; l != NULL; l = l->next) {
Expand Down Expand Up @@ -886,9 +886,9 @@ static gboolean launch_and_wait_default_handler(RaucInstallArgs *args, gchar* cw
install_args_update(args, "All slots updated");

res = TRUE;
r_context_end_step("update_slots", res);

out:
r_context_end_step("update_slots", res);
g_clear_pointer(&mountpoint, g_free);
return res;
}
Expand Down

0 comments on commit 62d048e

Please sign in to comment.