From 19b399d40237a1c930bfa8896573bd761f0ab438 Mon Sep 17 00:00:00 2001
From: Raja Boujbel <raja.boujbel@ocamlpro.com>
Date: Wed, 16 Jun 2021 18:21:27 +0200
Subject: [PATCH] fixup! root & format upgrade : set opam root to 2.1 and adapt
 format upgrade to this new version

---
 src/state/opamFormatUpgrade.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/state/opamFormatUpgrade.ml b/src/state/opamFormatUpgrade.ml
index 824d0a9a005..13b2804abca 100644
--- a/src/state/opamFormatUpgrade.ml
+++ b/src/state/opamFormatUpgrade.ml
@@ -1292,7 +1292,7 @@ let hard_upgrade_from_2_1_intermediates ?global_lock root =
   let opam_root_version = OpamFile.Config.raw_root_version config_f in
   match opam_root_version with
   | Some v when OpamVersion.compare v v2_0 <= 0
-             || OpamVersion.compare v2_1_rc v <= 0 ->
+             || OpamVersion.compare v2_1 v <= 0 ->
     () (* do nothing, need to reraise parsing exception *)
   | _ ->
     log "Intermediate opam root detected%s, launch hard upgrade"