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
This commit is contained in:
Owen W. Taylor
2018-07-17 10:31:09 -04:00
committed by Atomic Bot
parent 65770d800f
commit 8a32f0e718
3 changed files with 0 additions and 7 deletions

View File

@@ -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;

View File

@@ -21,8 +21,6 @@ set -euo pipefail
. $(dirname $0)/libtest.sh
export FLATPAK_ENABLE_EXPERIMENTAL_OCI=1
skip_without_bwrap
echo "1..7"

View File

@@ -21,8 +21,6 @@ set -euo pipefail
. $(dirname $0)/libtest.sh
export FLATPAK_ENABLE_EXPERIMENTAL_OCI=1
skip_without_bwrap
echo "1..2"