keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

app/libbuiltin: convert to new style

Browse Source 
Pretty straightforward stuff. Prep for further work.

Closes: #983
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2017-09-08 16:11:22 -04:00 committed by Atomic Bot
parent 150de0087e
commit df515fd2f1
1 changed files with 17 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/app/rpmostree-libbuiltin.c
View File

@ -33,15 +33,13 @@ rpmostree_usage_error (GOptionContext *context,
const char *message, const char *message,
GError **error) GError **error)
{ {
g_autofree char *help = NULL;
g_return_if_fail (context != NULL); g_return_if_fail (context != NULL);
g_return_if_fail (message != NULL); g_return_if_fail (message != NULL);
help = g_option_context_get_help (context, TRUE, NULL); g_autofree char *help = g_option_context_get_help (context, TRUE, NULL);
g_printerr ("%s\n", help); g_printerr ("%s\n", help);
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, message); (void) glnx_throw (error, "usage error: %s", message);
} }
/* Print the diff between the booted and pending deployments */ /* Print the diff between the booted and pending deployments */
@ -50,20 +48,12 @@ rpmostree_print_treepkg_diff_from_sysroot_path (const gchar *sysroot_path,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
glnx_unref_object OstreeSysroot *sysroot = NULL; g_autoptr(GFile) sysroot_file = g_file_new_for_path (sysroot_path);
glnx_unref_object GFile *sysroot_file = NULL; g_autoptr(OstreeSysroot) sysroot = ostree_sysroot_new (sysroot_file);
gboolean ret = FALSE;
sysroot_file = g_file_new_for_path (sysroot_path);
sysroot = ostree_sysroot_new (sysroot_file);
if (!ostree_sysroot_load (sysroot, cancellable, error)) if (!ostree_sysroot_load (sysroot, cancellable, error))
goto out; return FALSE;
ret = rpmostree_print_treepkg_diff (sysroot, cancellable, error); return rpmostree_print_treepkg_diff (sysroot, cancellable, error);
out:
return ret;
} }
/* Print the diff between the booted and pending deployments */ /* Print the diff between the booted and pending deployments */
@ -72,39 +62,32 @@ rpmostree_print_treepkg_diff (OstreeSysroot *sysroot,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
gboolean ret = FALSE; g_autoptr(GPtrArray) deployments = ostree_sysroot_get_deployments (sysroot);
OstreeDeployment *booted_deployment;
OstreeDeployment *new_deployment;
g_autoptr(GPtrArray) deployments =
ostree_sysroot_get_deployments (sysroot);
booted_deployment = ostree_sysroot_get_booted_deployment (sysroot);
g_assert (deployments->len > 1); g_assert (deployments->len > 1);
new_deployment = deployments->pdata[0];
OstreeDeployment *new_deployment = deployments->pdata[0];
OstreeDeployment *booted_deployment = ostree_sysroot_get_booted_deployment (sysroot);
if (booted_deployment && new_deployment != booted_deployment) if (booted_deployment && new_deployment != booted_deployment)
{ {
glnx_unref_object OstreeRepo *repo = NULL; g_autoptr(OstreeRepo) repo = NULL;
if (!ostree_sysroot_get_repo (sysroot, &repo, cancellable, error))
return FALSE;
const char *from_rev = ostree_deployment_get_csum (booted_deployment); const char *from_rev = ostree_deployment_get_csum (booted_deployment);
const char *to_rev = ostree_deployment_get_csum (new_deployment); const char *to_rev = ostree_deployment_get_csum (new_deployment);
g_autoptr(GPtrArray) removed = NULL; g_autoptr(GPtrArray) removed = NULL;
g_autoptr(GPtrArray) added = NULL; g_autoptr(GPtrArray) added = NULL;
g_autoptr(GPtrArray) modified_old = NULL; g_autoptr(GPtrArray) modified_old = NULL;
g_autoptr(GPtrArray) modified_new = NULL; g_autoptr(GPtrArray) modified_new = NULL;
if (!ostree_sysroot_get_repo (sysroot, &repo, cancellable, error))
goto out;
if (!rpm_ostree_db_diff (repo, from_rev, to_rev, if (!rpm_ostree_db_diff (repo, from_rev, to_rev,
&removed, &added, &modified_old, &modified_new, &removed, &added, &modified_old, &modified_new,
cancellable, error)) cancellable, error))
goto out; return FALSE;
rpmostree_diff_print (repo, removed, added, modified_old, modified_new); rpmostree_diff_print (repo, removed, added, modified_old, modified_new);
} }
ret = TRUE; return TRUE;
out:
return ret;
} }