summaryrefslogtreecommitdiff
path: root/src/ostree/ot-admin-builtin-diff.c
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2013-09-15 14:33:57 -0400
committerColin Walters <walters@verbum.org>2013-09-15 14:33:57 -0400
commitaf0f888057b5af2377f89e9602451ed8e61a5a80 (patch)
tree1801d678b38c9f5863d91c018ee359238b3770ff /src/ostree/ot-admin-builtin-diff.c
parent3715b0cc82fa46fceb3dfd51b9b91cf9bcebfa40 (diff)
downloadostree-af0f888057b5af2377f89e9602451ed8e61a5a80.tar.gz
libostree: Add new OstreeSysroot class
At the moment, just a container for a path, but we will start moving admin functionality here.
Diffstat (limited to 'src/ostree/ot-admin-builtin-diff.c')
-rw-r--r--src/ostree/ot-admin-builtin-diff.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ostree/ot-admin-builtin-diff.c b/src/ostree/ot-admin-builtin-diff.c
index 1758422e..e64fe7ea 100644
--- a/src/ostree/ot-admin-builtin-diff.c
+++ b/src/ostree/ot-admin-builtin-diff.c
@@ -37,7 +37,7 @@ static GOptionEntry options[] = {
};
gboolean
-ot_admin_builtin_diff (int argc, char **argv, GFile *sysroot, GCancellable *cancellable, GError **error)
+ot_admin_builtin_diff (int argc, char **argv, OstreeSysroot *sysroot, GCancellable *cancellable, GError **error)
{
GOptionContext *context;
gboolean ret = FALSE;
@@ -59,16 +59,16 @@ ot_admin_builtin_diff (int argc, char **argv, GFile *sysroot, GCancellable *canc
if (!g_option_context_parse (context, &argc, &argv, error))
goto out;
- repo_path = g_file_resolve_relative_path (sysroot, "ostree/repo");
+ repo_path = g_file_resolve_relative_path (ostree_sysroot_get_path (sysroot), "ostree/repo");
- if (!ot_admin_list_deployments (sysroot, &bootversion, &deployments,
+ if (!ot_admin_list_deployments (ostree_sysroot_get_path (sysroot), &bootversion, &deployments,
cancellable, error))
{
g_prefix_error (error, "While listing deployments: ");
goto out;
}
- if (!ot_admin_require_deployment_or_osname (sysroot, deployments,
+ if (!ot_admin_require_deployment_or_osname (ostree_sysroot_get_path (sysroot), deployments,
opt_osname, &deployment,
cancellable, error))
goto out;
@@ -83,7 +83,7 @@ ot_admin_builtin_diff (int argc, char **argv, GFile *sysroot, GCancellable *canc
goto out;
}
- deployment_dir = ot_admin_get_deployment_directory (sysroot, deployment);
+ deployment_dir = ot_admin_get_deployment_directory (ostree_sysroot_get_path (sysroot), deployment);
orig_etc_path = g_file_resolve_relative_path (deployment_dir, "usr/etc");
new_etc_path = g_file_resolve_relative_path (deployment_dir, "etc");