diff --git a/app/flatpak-builtins-install.c b/app/flatpak-builtins-install.c index f4328f2529..2a0d4c9f41 100644 --- a/app/flatpak-builtins-install.c +++ b/app/flatpak-builtins-install.c @@ -438,7 +438,7 @@ flatpak_builtin_install (int argc, char **argv, GCancellable *cancellable, GErro if (remote_dir_pairs->len == 0) return flatpak_fail (error, _("No remote refs found similar to ā€˜%sā€™"), argv[1]); - if (!flatpak_resolve_matching_remotes (opt_yes, remote_dir_pairs, argv[1], &chosen_pair, error)) + if (!flatpak_resolve_matching_remotes (remote_dir_pairs, argv[1], &chosen_pair, error)) return FALSE; remote = g_strdup (chosen_pair->remote_name); diff --git a/app/flatpak-builtins-utils.c b/app/flatpak-builtins-utils.c index bec64a2ef5..7439475b78 100644 --- a/app/flatpak-builtins-utils.c +++ b/app/flatpak-builtins-utils.c @@ -552,8 +552,7 @@ flatpak_resolve_matching_installed_refs (gboolean assume_yes, } gboolean -flatpak_resolve_matching_remotes (gboolean assume_yes, - GPtrArray *remote_dir_pairs, +flatpak_resolve_matching_remotes (GPtrArray *remote_dir_pairs, const char *opt_search_ref, RemoteDirPair **out_pair, GError **error) @@ -563,7 +562,11 @@ flatpak_resolve_matching_remotes (gboolean assume_yes, g_assert (remote_dir_pairs->len > 0); - if (assume_yes && remote_dir_pairs->len == 1) + /* Here we use the only matching remote even if --assumeyes wasn't specified + * because the user will still be asked to confirm the operation in the next + * step after the dependencies are resolved. + */ + if (remote_dir_pairs->len == 1) chosen = 1; if (chosen == 0) diff --git a/app/flatpak-builtins-utils.h b/app/flatpak-builtins-utils.h index 9920b403bc..8b2c1c8b15 100644 --- a/app/flatpak-builtins-utils.h +++ b/app/flatpak-builtins-utils.h @@ -90,8 +90,7 @@ gboolean flatpak_resolve_matching_installed_refs (gboolean assume_yes, GPtrArray *out_pairs, GError **error); -gboolean flatpak_resolve_matching_remotes (gboolean assume_yes, - GPtrArray *remote_dir_pairs, +gboolean flatpak_resolve_matching_remotes (GPtrArray *remote_dir_pairs, const char *opt_search_ref, RemoteDirPair **out_pair, GError **error);