diff --git a/apidoc/ostree-sections.txt b/apidoc/ostree-sections.txt index a91663ed..5dbafc5f 100644 --- a/apidoc/ostree-sections.txt +++ b/apidoc/ostree-sections.txt @@ -298,7 +298,7 @@ ostree_repo_get_mode ostree_repo_get_min_free_space_bytes ostree_repo_get_config ostree_repo_get_dfd -ostree_repo_get_repo_finders +ostree_repo_get_default_repo_finders ostree_repo_hash ostree_repo_equal ostree_repo_copy_config diff --git a/man/ostree.repo-config.xml b/man/ostree.repo-config.xml index 3ea24486..acaa3be5 100644 --- a/man/ostree.repo-config.xml +++ b/man/ostree.repo-config.xml @@ -217,7 +217,7 @@ Boston, MA 02111-1307, USA. - repo-finders + default-repo-finders Semicolon separated default list of finders (sources for refs) to use when pulling. This can be used to disable pulling from mounted filesystems, peers on the local network, diff --git a/src/libostree/libostree-devel.sym b/src/libostree/libostree-devel.sym index 80b04fd5..38f71486 100644 --- a/src/libostree/libostree-devel.sym +++ b/src/libostree/libostree-devel.sym @@ -21,7 +21,7 @@ LIBOSTREE_2018.9 { ostree_mutable_tree_remove; ostree_repo_get_min_free_space_bytes; - ostree_repo_get_repo_finders; + ostree_repo_get_default_repo_finders; } LIBOSTREE_2018.7; /* Stub section for the stable release *after* this development one; don't diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c index fe095057..fa3c2a94 100644 --- a/src/libostree/ostree-repo.c +++ b/src/libostree/ostree-repo.c @@ -2942,7 +2942,7 @@ reload_core_config (OstreeRepo *self, { g_auto(GStrv) configured_finders = NULL; g_autoptr(GError) local_error = NULL; - configured_finders = g_key_file_get_string_list (self->config, "core", "repo-finders", + configured_finders = g_key_file_get_string_list (self->config, "core", "default-repo-finders", NULL, &local_error); if (g_error_matches (local_error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_KEY_NOT_FOUND)) g_clear_error (&local_error); @@ -2953,7 +2953,7 @@ reload_core_config (OstreeRepo *self, } if (configured_finders != NULL && *configured_finders == NULL) - return glnx_throw (error, "Invalid empty repo-finders configuration"); + return glnx_throw (error, "Invalid empty default-repo-finders configuration"); for (char **iter = configured_finders; iter && *iter; iter++) { @@ -5952,18 +5952,18 @@ ostree_repo_set_collection_id (OstreeRepo *self, } /** - * ostree_repo_get_repo_finders: + * ostree_repo_get_default_repo_finders: * @self: an #OstreeRepo * - * Get the set of repo finders configured. See the documentation for - * the "core.repo-finders" config key. + * Get the set of default repo finders configured. See the documentation for + * the "core.default-repo-finders" config key. * * Returns: (array zero-terminated=1) (element-type utf8): * %NULL-terminated array of strings. * Since: 2018.9 */ const gchar * const * -ostree_repo_get_repo_finders (OstreeRepo *self) +ostree_repo_get_default_repo_finders (OstreeRepo *self) { g_return_val_if_fail (OSTREE_IS_REPO (self), NULL); diff --git a/src/libostree/ostree-repo.h b/src/libostree/ostree-repo.h index 2f7abf6d..829164ba 100644 --- a/src/libostree/ostree-repo.h +++ b/src/libostree/ostree-repo.h @@ -113,7 +113,7 @@ gboolean ostree_repo_set_collection_id (OstreeRepo *self, GError **error); _OSTREE_PUBLIC -const gchar * const * ostree_repo_get_repo_finders (OstreeRepo *self); +const gchar * const * ostree_repo_get_default_repo_finders (OstreeRepo *self); _OSTREE_PUBLIC GFile * ostree_repo_get_path (OstreeRepo *self);