From 3333069a68b3716b79ee7f5342f0e97d9d69fcbc Mon Sep 17 00:00:00 2001 From: Ryan Gonzalez Date: Mon, 21 Jan 2019 14:34:52 -0600 Subject: [PATCH] remote-delete: Avoid a "remote not found" error when deleting an -origin remote Closes: #2626 Approved by: matthiasclasen --- app/flatpak-builtins-remote-delete.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/flatpak-builtins-remote-delete.c b/app/flatpak-builtins-remote-delete.c index 85d0f0c0..d02fed50 100644 --- a/app/flatpak-builtins-remote-delete.c +++ b/app/flatpak-builtins-remote-delete.c @@ -123,6 +123,10 @@ flatpak_builtin_remote_delete (int argc, char **argv, GCancellable *cancellable, } } + if (g_str_has_suffix (remote_name, "-origin")) + // The remote has already been deleted because all its refs were deleted. + return TRUE; + if (!flatpak_dir_remove_remote (preferred_dir, opt_force, remote_name, cancellable, error)) return FALSE;