Format upgrade fix: remove missing switches from config file #4715
Conversation
rjbou
changed the title
rjbou
changed the title
| | exception (OpamPp.Bad_version _ as e) -> | ||
| match OpamFile.Config.raw_root_version (OpamPath.config root) with | ||
| | None -> raise e | ||
| | Some _ -> |
There was a problem hiding this comment.
Should it be constrained to root version 2.1~rc/2.1 ?
There was a problem hiding this comment.
I think so - doesn't this become a problem in future if it gets opam-root-version: "2.2"?
There was a problem hiding this comment.
With a 2.2 opam root, the local switch upgrade won't be triggered, yes.
There was a problem hiding this comment.
Ah, of course, the whole thing is in the exception for an incorrect version.
There was a problem hiding this comment.
Since this fix is only necessary for intermediate dev versions, I'd say we remove it from 2.2 or at least 2.3: it'll keep the upgrade code more maintainable and we can reasonably assume anyone who tried one of the affected versions switched to the release in the meantime ?
There was a problem hiding this comment.
it's unregistered local switch, they can stay around for a while without noticing
… to this new version
…h only with a write lock
| | exception (OpamPp.Bad_version _ as e) -> | ||
| match OpamFile.Config.raw_root_version (OpamPath.config root) with | ||
| | None -> raise e | ||
| | Some _ -> |
There was a problem hiding this comment.
Since this fix is only necessary for intermediate dev versions, I'd say we remove it from 2.2 or at least 2.3: it'll keep the upgrade code more maintainable and we can reasonably assume anyone who tried one of the affected versions switched to the release in the meantime ?
| @@ -476,6 +484,65 @@ let run_test ?(vars=[]) ~opam t = | |||
| List.fold_left | |||
| (fun vars (v, r) -> (v, r) :: List.filter (fun (w, _) -> v <> w) vars) | |||
| vars bindings | |||
| | Cat files -> | |||
| let print_opamfile header file = | |||
There was a problem hiding this comment.
This probably deserves to be a top-level function 😁
There was a problem hiding this comment.
it will be removed from run.ml to be an outside program
fix The layout update should not fail even if the installed-switches are incorrect #4713