mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-04-04 07:11:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve handling of FLATPAK_BUILTIN_FLAG_ONE_DIR

Browse Source 
Error out for all combinations of options that specify
more than one installations.

This was showing up e.g. with

flatpak config --installation=extra --system --get languages

Closes: #2511
Approved by: mwleeds
This commit is contained in:
Matthias Clasen
2018-12-30 14:48:24 -05:00
committed by Atomic Bot
parent c39ceac02e
commit d9982d8550
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/flatpak-main.c
View File

@@ -375,15 +375,19 @@ flatpak_option_context_parse (GOptionContext *context,
{
FlatpakDir *dir;
if ((opt_system && opt_user) ||
(opt_system && opt_installations != NULL) ||
(opt_user && opt_installations != NULL) ||
(opt_installations != NULL && opt_installations[1] != NULL))
return usage_error (context, _("Multiple installations specified for a command "
"that works on one installation"), error);
if (opt_system || (!opt_user && opt_installations == NULL))
dir = flatpak_dir_get_system_default ();
else if (opt_user)
dir = flatpak_dir_get_user ();
else if (opt_installations != NULL)
{
if (g_strv_length (opt_installations) > 1)
return usage_error (context, _("The --installation option was used multiple times "
"for a command that works on one installation"), error);
dir = flatpak_dir_get_system_by_id (opt_installations[0], cancellable, error);
if (dir == NULL)
return FALSE;