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

Clean up dangling exported symlinks on deploy.

tingping/wmclass
Alexander Larsson 2015-01-09 12:22:41 +01:00
parent 15642f471d
commit cf9713e9c4
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xdg-app-dir.c
View File

@ -446,6 +446,7 @@ xdg_app_dir_deploy (XdgAppDir *self,
G_FILE_CREATE_NONE, NULL, cancellable, error))
goto out;
exports = xdg_app_dir_get_exports_dir (self);
if (g_str_has_prefix (ref, "app"))
{
export = g_file_get_child (checkoutdir, "export");
@ -454,7 +455,6 @@ xdg_app_dir_deploy (XdgAppDir *self,
gs_free char *relative_path = NULL;
gs_free char *symlink_prefix = NULL;
exports = xdg_app_dir_get_exports_dir (self);
relative_path = g_file_get_relative_path (self->basedir, export);
symlink_prefix = g_build_filename ("..", relative_path, NULL);
@ -469,6 +469,12 @@ xdg_app_dir_deploy (XdgAppDir *self,
if (!xdg_app_dir_set_active (self, ref, checksum, cancellable, error))
goto out;
if (g_file_query_exists (exports, cancellable))
{
if (!xdg_app_remove_dangling_symlinks (exports, cancellable, error))
goto out;
}
ret = TRUE;
out:
return ret;