From ca4f7d75f5e631accb044c6edffbd041a5af1c20 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Fri, 16 Apr 2021 12:45:20 +0100
Subject: [PATCH] pv-wrap: Remove environment variable gate for patched Flatpak

Everything we need is in Flatpak git master now, so we don't need to
allow for people who have patched their Flatpak with my WIP versions
of the same code.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 pressure-vessel/wrap-flatpak.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pressure-vessel/wrap-flatpak.c b/pressure-vessel/wrap-flatpak.c
index fbf45c5e0..37a5f0314 100644
--- a/pressure-vessel/wrap-flatpak.c
+++ b/pressure-vessel/wrap-flatpak.c
@@ -195,13 +195,6 @@ pv_wrap_check_flatpak (const char *tools_dir,
    * to run their own modified versions of Flatpak and pressure-vessel
    * should be using this, and those people can find this in the
    * source code */
-  else if (g_getenv ("PRESSURE_VESSEL_FLATPAK_PR4018") != NULL)
-    {
-      g_warning ("Assuming your version of Flatpak contains unmerged "
-                 "changes (#4018, #4125, #4126, #4093)");
-      subsandbox = get_subsandbox_adverb (launch_executable);
-    }
-  /* Also deliberately not documented */
   else if (g_getenv ("PRESSURE_VESSEL_FLATPAK_SANDBOX_ESCAPE") != NULL)
     {
       g_autofree gchar *policy = NULL;
-- 
GitLab