From 4abaf27e578a89f531e0e4c4ad95da6f6ba3d188 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sun, 15 Sep 2013 20:21:49 -0400 Subject: [PATCH] admin: Drop two uses of ostree_sysroot_get_path() Moving towards it being a full library. --- src/ostree/ot-admin-builtin-diff.c | 3 --- src/ostree/ot-admin-builtin-upgrade.c | 5 +---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/ostree/ot-admin-builtin-diff.c b/src/ostree/ot-admin-builtin-diff.c index 88e3717e..8c543928 100644 --- a/src/ostree/ot-admin-builtin-diff.c +++ b/src/ostree/ot-admin-builtin-diff.c @@ -41,7 +41,6 @@ ot_admin_builtin_diff (int argc, char **argv, OstreeSysroot *sysroot, GCancellab { GOptionContext *context; gboolean ret = FALSE; - gs_unref_object GFile *repo_path = NULL; gs_unref_object OstreeDeployment *deployment = NULL; gs_unref_object GFile *deployment_dir = NULL; gs_unref_ptrarray GPtrArray *modified = NULL; @@ -59,8 +58,6 @@ ot_admin_builtin_diff (int argc, char **argv, OstreeSysroot *sysroot, GCancellab if (!g_option_context_parse (context, &argc, &argv, error)) goto out; - repo_path = g_file_resolve_relative_path (ostree_sysroot_get_path (sysroot), "ostree/repo"); - if (!ostree_sysroot_list_deployments (sysroot, &bootversion, &deployments, cancellable, error)) { diff --git a/src/ostree/ot-admin-builtin-upgrade.c b/src/ostree/ot-admin-builtin-upgrade.c index 70204006..563b14be 100644 --- a/src/ostree/ot-admin-builtin-upgrade.c +++ b/src/ostree/ot-admin-builtin-upgrade.c @@ -47,7 +47,6 @@ ot_admin_builtin_upgrade (int argc, char **argv, OstreeSysroot *sysroot, GCancel gboolean ret = FALSE; GOptionContext *context; gs_unref_object OstreeRepo *repo = NULL; - gs_unref_object GFile *repo_path = NULL; gs_free char *origin_refspec = NULL; gs_free char *origin_remote = NULL; gs_free char *origin_ref = NULL; @@ -90,9 +89,7 @@ ot_admin_builtin_upgrade (int argc, char **argv, OstreeSysroot *sysroot, GCancel deployment_path = ostree_sysroot_get_deployment_directory (sysroot, merge_deployment); deployment_origin_path = ostree_sysroot_get_deployment_origin_path (deployment_path); - repo_path = g_file_resolve_relative_path (ostree_sysroot_get_path (sysroot), "ostree/repo"); - repo = ostree_repo_new (repo_path); - if (!ostree_repo_open (repo, cancellable, error)) + if (!ostree_sysroot_get_repo (sysroot, &repo, cancellable, error)) goto out; origin = ostree_deployment_get_origin (merge_deployment);