diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-09-05 16:36:44 -0400 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-09-06 20:31:12 -0400 |
| commit | 5082e1d8e9b327a02115c6fcc8a50d3d262e763a (patch) | |
| tree | 8e6007df1e1007d586fb0c8abd236222bf2cc7d4 /src/libostree/ostree-repo-libarchive.c | |
| parent | c817217ad85e5c5589644b39250f44d206e2b21b (diff) | |
| download | ostree-5082e1d8e9b327a02115c6fcc8a50d3d262e763a.tar.gz | |
repo: Rename "stage" to "write" in the API
An earlier version of this API acted like git in that some objects
would be staged in a temporary directory which would be then committed
in one go by moving files around. The API doesn't match most users
expectations though, as while the stage is nice as a high-level API
it isn't really suited for low-level APIs.
While the stage was removed, the APIs were never renamed. Rename
them now so that they match expectations.
https://bugzilla.gnome.org/show_bug.cgi?id=707644
Diffstat (limited to 'src/libostree/ostree-repo-libarchive.c')
| -rw-r--r-- | src/libostree/ostree-repo-libarchive.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libostree/ostree-repo-libarchive.c b/src/libostree/ostree-repo-libarchive.c index 7c0348e9..b75d3fa6 100644 --- a/src/libostree/ostree-repo-libarchive.c +++ b/src/libostree/ostree-repo-libarchive.c @@ -119,7 +119,7 @@ import_libarchive_entry_file (OstreeRepo *self, &file_object_input, &length, cancellable, error)) goto out; - if (!ostree_repo_stage_content (self, NULL, file_object_input, length, out_csum, + if (!ostree_repo_write_content (self, NULL, file_object_input, length, out_csum, cancellable, error)) goto out; @@ -129,7 +129,7 @@ import_libarchive_entry_file (OstreeRepo *self, } static gboolean -stage_libarchive_entry_to_mtree (OstreeRepo *self, +write_libarchive_entry_to_mtree (OstreeRepo *self, OstreeMutableTree *root, struct archive *a, struct archive_entry *entry, @@ -242,7 +242,7 @@ stage_libarchive_entry_to_mtree (OstreeRepo *self, if (g_file_info_get_file_type (file_info) == G_FILE_TYPE_DIRECTORY) { - if (!_ostree_repo_stage_directory_meta (self, file_info, NULL, &tmp_csum, cancellable, error)) + if (!_ostree_repo_write_directory_meta (self, file_info, NULL, &tmp_csum, cancellable, error)) goto out; if (parent == NULL) @@ -288,7 +288,7 @@ stage_libarchive_entry_to_mtree (OstreeRepo *self, #endif gboolean -ostree_repo_stage_archive_to_mtree (OstreeRepo *self, +ostree_repo_write_archive_to_mtree (OstreeRepo *self, GFile *archive_f, OstreeMutableTree *root, OstreeRepoCommitModifier *modifier, @@ -336,11 +336,11 @@ ostree_repo_stage_archive_to_mtree (OstreeRepo *self, g_file_info_set_attribute_uint32 (tmp_dir_info, "unix::gid", archive_entry_gid (entry)); g_file_info_set_attribute_uint32 (tmp_dir_info, "unix::mode", 0755 | S_IFDIR); - if (!_ostree_repo_stage_directory_meta (self, tmp_dir_info, NULL, &tmp_csum, cancellable, error)) + if (!_ostree_repo_write_directory_meta (self, tmp_dir_info, NULL, &tmp_csum, cancellable, error)) goto out; } - if (!stage_libarchive_entry_to_mtree (self, root, a, + if (!write_libarchive_entry_to_mtree (self, root, a, entry, modifier, autocreate_parents ? tmp_csum : NULL, cancellable, error)) |