mirror of
https://github.com/flatpak/flatpak.git
synced 2026-03-20 16:04:29 -04:00
b3828eea46
Currently "flatpak remotes" shows remotes across user and system installations, but other remote commands (remote-delete, remote-modify, remote-ls, remote-info) only work on one installation: the system one unless overridden using --user or --installation. This commit changes each command to infer the correct installation by checking which has the specified remote. In case multiple installations have remotes by the same name, the user is prompted to decide which to use. This commit also adds unit tests and updates the man pages for the aforementioned commands. Fixes https://github.com/flatpak/flatpak/issues/787 Closes: #1205 Approved by: alexlarsson
114 lines
3.3 KiB
C
114 lines
3.3 KiB
C
/*
|
|
* Copyright © 2014 Red Hat, Inc
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
* Authors:
|
|
* Alexander Larsson <alexl@redhat.com>
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <locale.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <string.h>
|
|
|
|
#include <glib/gi18n.h>
|
|
|
|
#include "libglnx/libglnx.h"
|
|
|
|
#include "flatpak-builtins.h"
|
|
#include "flatpak-builtins-utils.h"
|
|
|
|
static gboolean opt_force;
|
|
|
|
static GOptionEntry delete_options[] = {
|
|
{ "force", 0, 0, G_OPTION_ARG_NONE, &opt_force, N_("Remove remote even if in use"), NULL },
|
|
{ NULL }
|
|
};
|
|
|
|
|
|
gboolean
|
|
flatpak_builtin_delete_remote (int argc, char **argv, GCancellable *cancellable, GError **error)
|
|
{
|
|
g_autoptr(GOptionContext) context = NULL;
|
|
g_autoptr(GPtrArray) dirs = NULL;
|
|
g_autoptr(FlatpakDir) preferred_dir = NULL;
|
|
const char *remote_name;
|
|
|
|
context = g_option_context_new (_("NAME - Delete a remote repository"));
|
|
g_option_context_set_translation_domain (context, GETTEXT_PACKAGE);
|
|
|
|
g_option_context_add_main_entries (context, delete_options, NULL);
|
|
|
|
if (!flatpak_option_context_parse (context, NULL, &argc, &argv,
|
|
FLATPAK_BUILTIN_FLAG_STANDARD_DIRS, &dirs, cancellable, error))
|
|
return FALSE;
|
|
|
|
if (argc < 2)
|
|
return usage_error (context, _("NAME must be specified"), error);
|
|
|
|
remote_name = argv[1];
|
|
|
|
if (argc > 2)
|
|
return usage_error (context, _("Too many arguments"), error);
|
|
|
|
if (!flatpak_resolve_duplicate_remotes (dirs, remote_name, &preferred_dir, cancellable, error))
|
|
return FALSE;
|
|
|
|
if (!flatpak_dir_remove_remote (preferred_dir, opt_force, remote_name,
|
|
cancellable, error))
|
|
return FALSE;
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
gboolean
|
|
flatpak_complete_delete_remote (FlatpakCompletion *completion)
|
|
{
|
|
g_autoptr(GOptionContext) context = NULL;
|
|
g_autoptr(GPtrArray) dirs = NULL;
|
|
int i;
|
|
|
|
context = g_option_context_new ("");
|
|
if (!flatpak_option_context_parse (context, delete_options, &completion->argc, &completion->argv,
|
|
FLATPAK_BUILTIN_FLAG_STANDARD_DIRS, &dirs, NULL, NULL))
|
|
return FALSE;
|
|
|
|
switch (completion->argc)
|
|
{
|
|
case 0:
|
|
case 1: /* REMOTE */
|
|
flatpak_complete_options (completion, global_entries);
|
|
flatpak_complete_options (completion, delete_options);
|
|
flatpak_complete_options (completion, user_entries);
|
|
|
|
for (i = 0; i < dirs->len; i++)
|
|
{
|
|
FlatpakDir *dir = g_ptr_array_index (dirs, i);
|
|
int j;
|
|
g_auto(GStrv) remotes = flatpak_dir_list_remotes (dir, NULL, NULL);
|
|
if (remotes == NULL)
|
|
return FALSE;
|
|
for (j = 0; remotes[j] != NULL; j++)
|
|
flatpak_complete_word (completion, "%s ", remotes[j]);
|
|
}
|
|
|
|
break;
|
|
}
|
|
|
|
return TRUE;
|
|
}
|