From 5fccf0cc0d713680ee27885a942dba6fa9ae424d Mon Sep 17 00:00:00 2001 From: Robert McQueen Date: Wed, 12 Jul 2017 18:36:22 +0100 Subject: [PATCH] remote-add: also ignore resolver errors Resolver errors are more likely in offline remote adds than IO errors. Catch them first when we're downgrading metadata update errors to a warning. https://phabricator.endlessm.com/T17172 --- app/flatpak-builtins-add-remote.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/flatpak-builtins-add-remote.c b/app/flatpak-builtins-add-remote.c index dbb8a42a2..60651ec24 100644 --- a/app/flatpak-builtins-add-remote.c +++ b/app/flatpak-builtins-add-remote.c @@ -367,7 +367,8 @@ flatpak_builtin_add_remote (int argc, char **argv, remote should already be usable. */ if (!flatpak_dir_update_remote_configuration (dir, remote_name, cancellable, &local_error)) { - if (g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_FAILED)) + if (local_error->domain == G_RESOLVER_ERROR || + g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_FAILED)) { g_printerr (_("Warning: Could not update extra metadata for '%s': %s\n"), remote_name, local_error->message); }