mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-03-16 22:19:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update exports on uninstall too

Browse Source 
This means we remove dangling links and re-run triggers.
This commit is contained in:
Alexander Larsson
2015-01-19 12:12:30 +01:00
parent 626fdf971b
commit deab96c8fb
1 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
xdg-app-dir.c
View File

@@ -710,6 +710,30 @@ xdg_app_export_dir (const char *app,
return ret;
}
static gboolean
xdg_app_dir_update_exports (XdgAppDir *self,
GCancellable *cancellable,
GError **error)
{
gboolean ret = FALSE;
gs_unref_object GFile *exports = NULL;
exports = xdg_app_dir_get_exports_dir (self);
if (g_file_query_exists (exports, cancellable))
{
if (!xdg_app_remove_dangling_symlinks (exports, cancellable, error))
goto out;
if (!xdg_app_dir_run_triggers (self, cancellable, error))
goto out;
}
ret = TRUE;
out:
return ret;
}
gboolean
xdg_app_dir_deploy (XdgAppDir *self,
@@ -839,14 +863,8 @@ xdg_app_dir_deploy (XdgAppDir *self,
if (!xdg_app_dir_set_active (self, ref, checksum, cancellable, error))
goto out;
if (is_app && g_file_query_exists (exports, cancellable))
{
if (!xdg_app_remove_dangling_symlinks (exports, cancellable, error))
goto out;
if (!xdg_app_dir_run_triggers (self, cancellable, error))
goto out;
}
if (is_app && !xdg_app_dir_update_exports (self, cancellable, error))
goto out;
ret = TRUE;
out:
@@ -925,6 +943,7 @@ xdg_app_dir_undeploy (XdgAppDir *self,
gs_unref_object GFile *removeddir = NULL;
gs_free char *tmpname = NULL;
gs_free char *active = NULL;
gboolean is_app;
int i;
g_assert (ref != NULL);
@@ -985,6 +1004,11 @@ xdg_app_dir_undeploy (XdgAppDir *self,
if (!gs_shutil_rm_rf (removeddir, cancellable, error))
goto out;
is_app = g_str_has_prefix (ref, "app");
if (is_app && !xdg_app_dir_update_exports (self, cancellable, error))
goto out;
ret = TRUE;
out:
return ret;