mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-02-05 05:21:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

revokefs use: Don't delete the repo in the client when using revokefs

Browse Source 
It is already removed in the system-helper, and the client doesn't
have permissions to delete it anyway (except for in the tests where
it was breaking things).

Closes: #2657
Approved by: alexlarsson
This commit is contained in:
Alexander Larsson
2019-04-04 14:38:38 +02:00
committed by Atomic Bot
parent 3f746bc328
commit c6faa78403
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/flatpak-dir.c
View File

@@ -7967,6 +7967,7 @@ flatpak_dir_install (FlatpakDir *self,
gboolean gpg_verify_summary;
gboolean gpg_verify;
gboolean is_oci;
gboolean is_revokefs_pull = FALSE;
if (opt_subpaths)
subpaths = opt_subpaths;
@@ -8048,7 +8049,6 @@ flatpak_dir_install (FlatpakDir *self,
In case we fail to apply pull approach 1), the pull automatically fallbacks to use 2). */
g_autofree gchar *src_dir = NULL;
g_autofree gchar *mnt_dir = NULL;
gboolean is_revokefs_pull = FALSE;
g_autoptr(GError) local_error = NULL;
if (!flatpak_dir_setup_revokefs_fuse_mount (self,
@@ -8170,7 +8170,7 @@ flatpak_dir_install (FlatpakDir *self,
error))
return FALSE;
if (child_repo_path)
if (child_repo_path && !is_revokefs_pull)
(void) glnx_shutil_rm_rf_at (AT_FDCWD, child_repo_path, NULL, NULL);
return TRUE;