Merge pull request #4571 from dra27/pinning-base

Don't confirm pinning invariant packages
ocaml · Mar 7, 2021 · 1c9f023 · 1c9f023
2 parents 70f74ae + b2c4398
commit 1c9f023
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/master_changes.md b/master_changes.md
@@ -28,6 +28,8 @@ New option/command/subcommand are prefixed with ◈.
 
 ## Pin
   * Don't look for lock files for pin depends [#4511 @rjbou - fix #4505]
+  * Don't ask for confirmation for pinning base packages (similarly makes no
+    sense with 2.1 switch invariants) [#4571 @dra27]
 
 ## List
   *

diff --git a/src/client/opamPinCommand.ml b/src/client/opamPinCommand.ml
@@ -486,14 +486,6 @@ and source_pin
       (* else raise Exns.Aborted *);
       cur_version, cur_urlf
     with Not_found ->
-      if OpamPackage.has_name st.compiler_packages name then (
-        OpamConsole.warning
-          "Package %s is part of the base packages of this compiler."
-          (OpamPackage.Name.to_string name);
-        if not @@ OpamConsole.confirm
-            "Are you sure you want to override this and pin it anyway?"
-        then raise Aborted
-      );
       let version = default_version st name in
       version, None
   in