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

override: Fix error if override file doesn't already exist

tingping/wmclass
Alexander Larsson 2016-01-19 12:09:54 +01:00
parent 8b3cc77955
commit 24ec8445a3
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/xdg-app-builtins-override.c
View File

@ -47,6 +47,7 @@ xdg_app_builtin_override (int argc, char **argv, GCancellable *cancellable, GErr
g_autoptr(XdgAppDir) dir = NULL;
g_autoptr(GKeyFile) metakey = NULL;
g_autoptr(XdgAppContext) overrides = NULL;
g_autoptr(GError) my_error = NULL;
context = g_option_context_new ("APP - Override settings for application");
@ -67,9 +68,16 @@ xdg_app_builtin_override (int argc, char **argv, GCancellable *cancellable, GErr
if (!xdg_app_is_valid_name (app))
return xdg_app_fail (error, "'%s' is not a valid application name", app);
metakey = xdg_app_load_override_keyfile (app, xdg_app_dir_is_user (dir), error);
metakey = xdg_app_load_override_keyfile (app, xdg_app_dir_is_user (dir), &my_error);
if (metakey == NULL)
return FALSE;
{
if (!g_error_matches (my_error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND))
{
g_propagate_error (error, g_steal_pointer (&my_error));
return NULL;
}
metakey = g_key_file_new ();
}
overrides = xdg_app_context_new ();
if (!xdg_app_context_load_metadata (overrides, metakey, error))

2
common/xdg-app-dir.c
View File

@ -327,7 +327,7 @@ xdg_app_load_override_file (const char *app_id, gboolean user, GError **error)
{
if (!g_error_matches (my_error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND))
{
g_propagate_error (error, g_steal_pointer (&error));
g_propagate_error (error, g_steal_pointer (&my_error));
return NULL;
}
}