From 8a32f0e7185e25dac5e33ea73f1070ce0e09a31b Mon Sep 17 00:00:00 2001
From: "Owen W. Taylor" <otaylor@fishsoup.net>
Date: Tue, 17 Jul 2018 10:31:09 -0400
Subject: [PATCH] Remove FLATPAK_ENABLE_EXPERIMENTAL_OCI envvar check

Now that appstream data and icons are retrievded from the index, the OCI
code is expected to be fully usable, and to work with registries as they
will actually be deployed.

Closes: #1910
Approved by: alexlarsson
---
 app/flatpak-builtins-add-remote.c | 3 ---
 tests/test-oci-registry.sh        | 2 --
 tests/test-oci.sh                 | 2 --
 3 files changed, 7 deletions(-)

diff --git a/app/flatpak-builtins-add-remote.c b/app/flatpak-builtins-add-remote.c
index 54a4e7c2..28b84196 100644
--- a/app/flatpak-builtins-add-remote.c
+++ b/app/flatpak-builtins-add-remote.c
@@ -374,9 +374,6 @@ flatpak_builtin_add_remote (int argc, char **argv,
       opt_url = remote_url;
     }
 
-  if (opt_oci && g_getenv ("FLATPAK_ENABLE_EXPERIMENTAL_OCI") == NULL)
-    return flatpak_fail (error, "flatpak remote-add --oci is currently unsupported and experimental, enable it by setting the FLATPAK_ENABLE_EXPERIMENTAL_OCI env var");
-
   /* Default to gpg verify, except for --oci */
   if (!opt_no_gpg_verify && !opt_oci)
     opt_do_gpg_verify = TRUE;
diff --git a/tests/test-oci-registry.sh b/tests/test-oci-registry.sh
index 49fb4b22..3814ce8c 100755
--- a/tests/test-oci-registry.sh
+++ b/tests/test-oci-registry.sh
@@ -21,8 +21,6 @@ set -euo pipefail
 
 . $(dirname $0)/libtest.sh
 
-export FLATPAK_ENABLE_EXPERIMENTAL_OCI=1
-
 skip_without_bwrap
 
 echo "1..7"
diff --git a/tests/test-oci.sh b/tests/test-oci.sh
index 44e4577a..d6d71d01 100755
--- a/tests/test-oci.sh
+++ b/tests/test-oci.sh
@@ -21,8 +21,6 @@ set -euo pipefail
 
 . $(dirname $0)/libtest.sh
 
-export FLATPAK_ENABLE_EXPERIMENTAL_OCI=1
-
 skip_without_bwrap
 
 echo "1..2"