[ostree] pull: Emit a better error if the remote isn't found



commit bb043b319f0a399608c89ce32472468199083e6d
Author: Colin Walters <walters verbum org>
Date:   Fri Jun 6 16:17:05 2014 -0400

    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

 src/libostree/ostree-repo-pull.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c
index dbcdc40..d15e336 100644
--- a/src/libostree/ostree-repo-pull.c
+++ b/src/libostree/ostree-repo-pull.c
@@ -1067,8 +1067,16 @@ ostree_repo_pull (OstreeRepo               *self,
   config = ostree_repo_get_config (self);
 
   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))
     goto out;
+
   pull_data->base_uri = soup_uri_new (baseurl);
 
 #ifdef HAVE_GPGME


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]