isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

extensions-tool: Handle existing extension folder

Browse Source 
g_file_make_directory_with_parents() returns an error if the directory
already exists (unlike g_mkdir_with_parents()), so it is currently
impossible to install more than a single extension, whoops.

Handle the error properly by just carrying on.

https://gitlab.gnome.org/fmuellner/gnome-extensions-tool/merge_requests/3
https://gitlab.gnome.org/GNOME/gnome-shell/issues/1234
This commit is contained in:
Florian Müllner 2019-01-11 23:35:12 +01:00
parent 653e6c85bb
commit 9d5c743a98
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/extensions-tool/command-install.c
View File

@ -121,7 +121,12 @@ install_extension (const char *bundle,
"gnome-shell", "extensions", NULL); "gnome-shell", "extensions", NULL);
if (!g_file_make_directory_with_parents (dstdir, NULL, &error)) if (!g_file_make_directory_with_parents (dstdir, NULL, &error))
goto err; {
if (error->code == G_IO_ERROR_EXISTS)
g_clear_error (&error);
else
goto err;
}
uuid = json_object_get_string_member (metadata, "uuid"); uuid = json_object_get_string_member (metadata, "uuid");
dst = g_file_get_child (dstdir, uuid); dst = g_file_get_child (dstdir, uuid);