diff options
| author | Colin Walters <walters@verbum.org> | 2017-07-25 10:11:57 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-07-26 18:52:04 +0000 |
| commit | e09fc83ab3f4b84685eff427acc29642d7d09104 (patch) | |
| tree | d59f0a92ec7fa9dbe9bbe7639da1e3c673da8838 /src/ostree/ot-builtin-commit.c | |
| parent | 0985158be7cf1529ddb349f0a1e3153600f187ad (diff) | |
| download | ostree-e09fc83ab3f4b84685eff427acc29642d7d09104.tar.gz | |
lib/core: Add #defines for ref/collection binding
These were previously private, but since we expect people to use them, let's add
`#define`s like we did for some of the other commit metadata.
Closes: #1028
Approved by: jlebon
Diffstat (limited to 'src/ostree/ot-builtin-commit.c')
| -rw-r--r-- | src/ostree/ot-builtin-commit.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/ostree/ot-builtin-commit.c b/src/ostree/ot-builtin-commit.c index 35340a04..8f359380 100644 --- a/src/ostree/ot-builtin-commit.c +++ b/src/ostree/ot-builtin-commit.c @@ -316,7 +316,7 @@ add_collection_binding (OstreeRepo *repo, if (collection_id == NULL) return; - g_variant_builder_add (metadata_builder, "{s@v}", OSTREE_COLLECTION_BINDING, + g_variant_builder_add (metadata_builder, "{s@v}", OSTREE_COMMIT_META_KEY_COLLECTION_BINDING, g_variant_new_variant (g_variant_new_string (collection_id))); } #endif /* OSTREE_ENABLE_EXPERIMENTAL_API */ @@ -345,10 +345,11 @@ add_ref_binding (GVariantBuilder *metadata_builder) g_ptr_array_sort (refs, compare_strings); g_autoptr(GVariant) refs_v = g_variant_new_strv ((const char *const *)refs->pdata, refs->len); - g_variant_builder_add (metadata_builder, "{s@v}", OSTREE_REF_BINDING, + g_variant_builder_add (metadata_builder, "{s@v}", OSTREE_COMMIT_META_KEY_REF_BINDING, g_variant_new_variant (g_steal_pointer (&refs_v))); } +/* Note if you're using the API, you currently need to do this yourself */ static void fill_bindings (OstreeRepo *repo, GVariant *metadata, @@ -363,7 +364,7 @@ fill_bindings (OstreeRepo *repo, /* Allow the collection ID to be overridden using * --add-metadata-string=ostree.collection-binding=blah */ if (metadata == NULL || - !g_variant_lookup (metadata, OSTREE_COLLECTION_BINDING, "*", NULL)) + !g_variant_lookup (metadata, OSTREE_COMMIT_META_KEY_COLLECTION_BINDING, "*", NULL)) add_collection_binding (repo, metadata_builder); #endif /* OSTREE_ENABLE_EXPERIMENTAL_API */ |