From c6faa784039b386ccbbe4dd315ea4d2f7896da2a Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Thu, 4 Apr 2019 14:38:38 +0200
Subject: [PATCH] revokefs use: Don't delete the repo in the client when using
 revokefs

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
---
 common/flatpak-dir.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c
index 5a5f4342..93f21e0b 100644
--- a/common/flatpak-dir.c
+++ b/common/flatpak-dir.c
@@ -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;