[ostree] libostree: Use ostree_repo_create() rather than spawning subprocess
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] libostree: Use ostree_repo_create() rather than spawning subprocess
- Date: Mon, 16 Sep 2013 13:53:22 +0000 (UTC)
commit c07c84cb6f17d2c709897188c2f7e46164636c30
Author: Colin Walters <walters verbum org>
Date: Mon Sep 16 08:52:16 2013 -0400
libostree: Use ostree_repo_create() rather than spawning subprocess
We have API now, yay!
src/libostree/ostree-sysroot.c | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 deletions(-)
---
diff --git a/src/libostree/ostree-sysroot.c b/src/libostree/ostree-sysroot.c
index 20b266d..e7bc34f 100644
--- a/src/libostree/ostree-sysroot.c
+++ b/src/libostree/ostree-sysroot.c
@@ -206,12 +206,11 @@ ostree_sysroot_ensure_initialized (OstreeSysroot *self,
gboolean ret = FALSE;
gs_unref_object GFile *dir = NULL;
gs_unref_object GFile *ostree_dir = NULL;
+ gs_unref_object GFile *repo_dir = NULL;
ostree_dir = g_file_get_child (self->path, "ostree");
-
- g_clear_object (&dir);
- dir = g_file_get_child (ostree_dir, "repo");
- if (!gs_file_ensure_directory (dir, TRUE, cancellable, error))
+ repo_dir = g_file_get_child (ostree_dir, "repo");
+ if (!gs_file_ensure_directory (repo_dir, TRUE, cancellable, error))
goto out;
g_clear_object (&dir);
@@ -223,16 +222,9 @@ ostree_sysroot_ensure_initialized (OstreeSysroot *self,
dir = ot_gfile_get_child_build_path (ostree_dir, "repo", "objects", NULL);
if (!g_file_query_exists (dir, NULL))
{
- gs_free char *opt_repo_arg = g_strdup_printf ("--repo=%s/repo",
- gs_file_get_path_cached (ostree_dir));
-
- if (!gs_subprocess_simple_run_sync (NULL, GS_SUBPROCESS_STREAM_DISPOSITION_NULL,
- cancellable, error,
- "ostree", opt_repo_arg, "init", NULL))
- {
- g_prefix_error (error, "Failed to initialize repository: ");
- goto out;
- }
+ gs_unref_object OstreeRepo *repo = ostree_repo_new (repo_dir);
+ if (!ostree_repo_create (repo, OSTREE_REPO_MODE_BARE, cancellable, error))
+ goto out;
}
ret = TRUE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]