temporary dev-repo-cleanup

prepare-opam.sh

@@ -36,13 +36,16 @@ eval `opam conf env`
 # By default, they are added with rank 1, i.e. at the top of the list. So we add them with increasing priority.
 test -d "$OPAMROOT/repo/coq-released" || opam repo add coq-released https://coq.inria.fr/opam/released
 if echo "$@" | egrep "(dev|beta)" > /dev/null; then
+    # Temporary: clean up some mess
+    test -d "$OPAMROOT/repo/coq-extra-dev" && opam repo -a remove coq-extra-dev
+    test -d "$OPAMROOT/repo/coq-core-dev" && opam repo -a remove coq-core-dev
     # We are compiling against a dev version of something.  Get ourselves the dev repositories.
-    test -d "$OPAMROOT/repo/coq-extra-dev" || opam repo add coq-extra-dev https://coq.inria.fr/opam/extra-dev
-    test -d "$OPAMROOT/repo/coq-core-dev" || opam repo add coq-core-dev https://coq.inria.fr/opam/core-dev
+    test -d "$OPAMROOT/repo/coq-extra-dev" || opam repo -a add coq-extra-dev https://coq.inria.fr/opam/extra-dev
+    test -d "$OPAMROOT/repo/coq-core-dev" || opam repo -a add coq-core-dev https://coq.inria.fr/opam/core-dev
 else
     # No dev version, make sure we do not have the dev repositories.
-    test -d "$OPAMROOT/repo/coq-extra-dev" && opam repo remove coq-extra-dev
-    test -d "$OPAMROOT/repo/coq-core-dev" && opam repo remove coq-core-dev
+    test -d "$OPAMROOT/repo/coq-extra-dev" && opam repo -a remove coq-extra-dev
+    test -d "$OPAMROOT/repo/coq-core-dev" && opam repo -a remove coq-core-dev
 fi
 test -d "$OPAMROOT/repo/iris-dev" || opam repo add iris-dev git+https://gitlab.mpi-sws.org/iris/opam.git
 opam repo prio iris-dev 1 # make sure this stays at the top