marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove internal API flatpak_dir_get(gboolean user) 

User and system installations is no longer a binary decision, so remove
this API to force explicit calls to either flatpak_dir_get_system_default()
or flatpak_dir_get_system_list() when dealing with system installations.
tingping/wmclass
Mario Sanchez Prada 2016-12-16 19:17:18 +00:00
parent 44a2d73c98
commit 22e3f83fb6
4 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/flatpak-builtins-list.c
View File

@ -91,8 +91,7 @@ print_installed_refs (gboolean app, gboolean runtime, gboolean print_system, gbo
if (print_user)
{
user_dir = flatpak_dir_get (TRUE);
user_dir = flatpak_dir_get_user ();
if (flatpak_dir_ensure_repo (user_dir, cancellable, NULL))
{
if (app && !flatpak_dir_list_refs (user_dir, "app", &user_app, cancellable, error))
@ -104,7 +103,7 @@ print_installed_refs (gboolean app, gboolean runtime, gboolean print_system, gbo
if (print_system)
{
system_dir = flatpak_dir_get (FALSE);
system_dir = flatpak_dir_get_system_default ();
if (flatpak_dir_ensure_repo (system_dir, cancellable, NULL))
{
if (app && !flatpak_dir_list_refs (system_dir, "app", &system_app, cancellable, error))

2
app/flatpak-main.c
View File

@ -236,7 +236,7 @@ flatpak_option_context_parse (GOptionContext *context,
if (!(flags & FLATPAK_BUILTIN_FLAG_NO_DIR))
{
dir = flatpak_dir_get (opt_user);
dir = opt_user ? flatpak_dir_get_user () : flatpak_dir_get_system_default ();
if (!flatpak_dir_ensure_path (dir, cancellable, error))
return FALSE;

11
common/flatpak-dir.c
View File

@ -484,7 +484,7 @@ flatpak_load_override_keyfile (const char *app_id, gboolean user, GError **error
g_autoptr(GKeyFile) metakey = g_key_file_new ();
g_autoptr(FlatpakDir) dir = NULL;
dir = flatpak_dir_get (user);
dir = user ? flatpak_dir_get_user () : flatpak_dir_get_system_default ();
metadata_contents = flatpak_dir_load_override (dir, app_id, &metadata_size, error);
if (metadata_contents == NULL)
@ -5684,15 +5684,6 @@ flatpak_dir_get_user (void)
return flatpak_dir_new (path, TRUE);
}
FlatpakDir *
flatpak_dir_get (gboolean user)
{
if (user)
return flatpak_dir_get_user ();
else
return flatpak_dir_get_system_default ();
}
static char *
get_group (const char *remote_name)
{

1
common/flatpak-dir.h
View File

@ -142,7 +142,6 @@ GKeyFile * flatpak_deploy_get_metadata (FlatpakDeploy *deploy);
FlatpakDir * flatpak_dir_new (GFile *basedir,
gboolean user);
FlatpakDir * flatpak_dir_clone (FlatpakDir *self);
FlatpakDir *flatpak_dir_get (gboolean user);
FlatpakDir *flatpak_dir_get_system_default (void);
FlatpakDir *flatpak_dir_get_user (void);
gboolean flatpak_dir_is_user (FlatpakDir *self);