pull: Emit a better error if the remote isn't found
The generic GKeyFile error isn't quite informative enough here. I hit this with the new compose process where we don't automatically inject a configured remote into the generated disk images; we expect people to add them. https://bugzilla.gnome.org/show_bug.cgi?id=731346
This commit is contained in:
parent
3d5ff5b542
commit
bb043b319f
|
|
@ -1067,8 +1067,16 @@ ostree_repo_pull (OstreeRepo *self,
|
||||||
config = ostree_repo_get_config (self);
|
config = ostree_repo_get_config (self);
|
||||||
|
|
||||||
remote_key = g_strdup_printf ("remote \"%s\"", pull_data->remote_name);
|
remote_key = g_strdup_printf ("remote \"%s\"", pull_data->remote_name);
|
||||||
|
if (!g_key_file_has_group (config, remote_key))
|
||||||
|
{
|
||||||
|
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
|
||||||
|
"No remote '%s' found in " SYSCONFDIR "/ostree/remotes.d",
|
||||||
|
remote_key);
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
if (!repo_get_string_key_inherit (self, remote_key, "url", &baseurl, error))
|
if (!repo_get_string_key_inherit (self, remote_key, "url", &baseurl, error))
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
pull_data->base_uri = soup_uri_new (baseurl);
|
pull_data->base_uri = soup_uri_new (baseurl);
|
||||||
|
|
||||||
#ifdef HAVE_GPGME
|
#ifdef HAVE_GPGME
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue