packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/deploy: Use in-function error prefixing more 

Pulling some of this out of stage deploy work. It's generally better as it's
easier to change functions to have multiple callers.

Closes: #1505
Approved by: jlebon
This commit is contained in:
Colin Walters 2018-03-19 11:57:20 -04:00 committed by Atomic Bot
parent 01717d7dfc
commit ce2449ad2e
1 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/libostree/ostree-sysroot-deploy.c
View File

@ -756,6 +756,7 @@ merge_configuration (OstreeSysroot *sysroot,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
GLNX_AUTO_PREFIX_ERROR ("During /etc merge", error);
g_autoptr(OstreeSePolicy) sepolicy = NULL; g_autoptr(OstreeSePolicy) sepolicy = NULL;
if (previous_deployment) if (previous_deployment)
@ -842,6 +843,7 @@ write_origin_file_internal (OstreeSysroot *sysroot,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
GLNX_AUTO_PREFIX_ERROR ("Writing out origin file", error);
GKeyFile *origin = GKeyFile *origin =
new_origin ? new_origin : ostree_deployment_get_origin (deployment); new_origin ? new_origin : ostree_deployment_get_origin (deployment);
@ -1489,6 +1491,7 @@ create_new_bootlinks (OstreeSysroot *self,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
GLNX_AUTO_PREFIX_ERROR ("Creating new current bootlinks", error);
glnx_autofd int ostree_dfd = -1; glnx_autofd int ostree_dfd = -1;
if (!glnx_opendirat (self->sysroot_fd, "ostree", TRUE, &ostree_dfd, error)) if (!glnx_opendirat (self->sysroot_fd, "ostree", TRUE, &ostree_dfd, error))
return FALSE; return FALSE;
@ -1551,6 +1554,7 @@ swap_bootlinks (OstreeSysroot *self,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
GLNX_AUTO_PREFIX_ERROR ("Swapping new version bootlinks", error);
glnx_autofd int ostree_dfd = -1; glnx_autofd int ostree_dfd = -1;
if (!glnx_opendirat (self->sysroot_fd, "ostree", TRUE, &ostree_dfd, error)) if (!glnx_opendirat (self->sysroot_fd, "ostree", TRUE, &ostree_dfd, error))
return FALSE; return FALSE;
@ -1620,6 +1624,7 @@ install_deployment_kernel (OstreeSysroot *sysroot,
GError **error) GError **error)
{ {
GLNX_AUTO_PREFIX_ERROR ("Installing kernel", error);
OstreeBootconfigParser *bootconfig = ostree_deployment_get_bootconfig (deployment); OstreeBootconfigParser *bootconfig = ostree_deployment_get_bootconfig (deployment);
g_autofree char *deployment_dirpath = ostree_sysroot_get_deployment_dirpath (sysroot, deployment); g_autofree char *deployment_dirpath = ostree_sysroot_get_deployment_dirpath (sysroot, deployment);
glnx_autofd int deployment_dfd = -1; glnx_autofd int deployment_dfd = -1;
@ -2134,10 +2139,7 @@ ostree_sysroot_write_deployments_with_options (OstreeSysroot *self,
if (!create_new_bootlinks (self, self->bootversion, if (!create_new_bootlinks (self, self->bootversion,
new_deployments, new_deployments,
cancellable, error)) cancellable, error))
{ goto out;
g_prefix_error (error, "Creating new current bootlinks: ");
goto out;
}
if (!full_system_sync (self, &syncstats, cancellable, error)) if (!full_system_sync (self, &syncstats, cancellable, error))
{ {
@ -2148,10 +2150,7 @@ ostree_sysroot_write_deployments_with_options (OstreeSysroot *self,
if (!swap_bootlinks (self, self->bootversion, if (!swap_bootlinks (self, self->bootversion,
new_deployments, new_deployments,
cancellable, error)) cancellable, error))
{ goto out;
g_prefix_error (error, "Swapping current bootlinks: ");
goto out;
}
bootloader_is_atomic = TRUE; bootloader_is_atomic = TRUE;
} }
@ -2211,26 +2210,17 @@ ostree_sysroot_write_deployments_with_options (OstreeSysroot *self,
if (!install_deployment_kernel (self, repo, new_bootversion, if (!install_deployment_kernel (self, repo, new_bootversion,
deployment, new_deployments->len, deployment, new_deployments->len,
show_osname, cancellable, error)) show_osname, cancellable, error))
{ goto out;
g_prefix_error (error, "Installing kernel: ");
goto out;
}
} }
/* Create and swap bootlinks for *new* version */ /* Create and swap bootlinks for *new* version */
if (!create_new_bootlinks (self, new_bootversion, if (!create_new_bootlinks (self, new_bootversion,
new_deployments, new_deployments,
cancellable, error)) cancellable, error))
{ goto out;
g_prefix_error (error, "Creating new version bootlinks: ");
goto out;
}
if (!swap_bootlinks (self, new_bootversion, new_deployments, if (!swap_bootlinks (self, new_bootversion, new_deployments,
cancellable, error)) cancellable, error))
{ goto out;
g_prefix_error (error, "Swapping new version bootlinks: ");
goto out;
}
g_debug ("Using bootloader: %s", bootloader ? g_debug ("Using bootloader: %s", bootloader ?
g_type_name (G_TYPE_FROM_INSTANCE (bootloader)) : "(none)"); g_type_name (G_TYPE_FROM_INSTANCE (bootloader)) : "(none)");
@ -2441,10 +2431,7 @@ ostree_sysroot_deploy_tree (OstreeSysroot *self,
deployment_dfd, deployment_dfd,
&sepolicy, &sepolicy,
cancellable, error)) cancellable, error))
{ return FALSE;
g_prefix_error (error, "During /etc merge: ");
return FALSE;
}
if (!selinux_relabel_var_if_needed (self, sepolicy, os_deploy_dfd, if (!selinux_relabel_var_if_needed (self, sepolicy, os_deploy_dfd,
cancellable, error)) cancellable, error))
@ -2470,10 +2457,7 @@ ostree_sysroot_deploy_tree (OstreeSysroot *self,
if (!write_origin_file_internal (self, new_deployment, NULL, if (!write_origin_file_internal (self, new_deployment, NULL,
GLNX_FILE_REPLACE_NODATASYNC, GLNX_FILE_REPLACE_NODATASYNC,
cancellable, error)) cancellable, error))
{ return FALSE;
g_prefix_error (error, "Writing out origin file: ");
return FALSE;
}
} }
/* After this, install_deployment_kernel() will set the other boot /* After this, install_deployment_kernel() will set the other boot