Fix #6374 once again

Author: kit-ty-kate

src/client/opamAuxCommands.ml

@@ -546,7 +546,9 @@ let autopin st ?(simulate=false) ?quiet ?locked ?recurse ?subpath
       OpamUpdate.dev_packages st ~working_dir:OpamPackage.Set.empty already_pinned
   in
   let st =
-    if OpamClientConfig.(!r.ignore_pin_depends) then st else
+    (* NOTE: We skip pin-depends on non-simulated because handle_pin_depends has
+       already been called in source_pin *)
+    if not simulate || OpamClientConfig.(!r.ignore_pin_depends) then st else
       OpamPackage.Set.fold (fun nv st ->
           OpamPinCommand.handle_pin_depends st nv (OpamSwitchState.opam st nv))
         (OpamPackage.Set.union pins already_pinned_set) st

tests/reftests/autopin.test

@@ -401,10 +401,6 @@ The following additional pinnings are required by local-with-pin-deps.dev:
 Pin and install them? [Y/n] n
 Try to install anyway, assuming `--ignore-pin-depends'? [Y/n] y
 local-with-pin-deps is now pinned to file://${BASEDIR}/local-with-pin-deps (version dev)
-The following additional pinnings are required by local-with-pin-deps.dev:
-  - pin-dep.dev at file://${BASEDIR}/pin-dep
-Pin and install them? [Y/n] n
-Try to install anyway, assuming `--ignore-pin-depends'? [Y/n] y
 
 <><> Installing new switch packages <><><><><><><><><><><><><><><><><><><><><><>
 Switch invariant: ["ocaml" {>= "4.05.0"}]

tests/reftests/pin-depends.test

@@ -82,10 +82,6 @@ The following additional pinnings are required by local-with-pin-deps.dev:
 Pin and install them? [Y/n] n
 Try to install anyway, assuming `--ignore-pin-depends'? [Y/n] y
 local-with-pin-deps is now pinned to file://${BASEDIR}/local-with-pin-deps (version dev)
-The following additional pinnings are required by local-with-pin-deps.dev:
-  - pin-dep.dev at file://${BASEDIR}/pin-dep
-Pin and install them? [Y/n] n
-Try to install anyway, assuming `--ignore-pin-depends'? [Y/n] y
 [ERROR] Package conflict!
   * Missing dependency:
     - local-with-pin-deps -> pin-dep
@@ -193,10 +189,6 @@ The following additional pinnings are required by local-with-pin-deps.dev:
 Pin and install them? [Y/n] n
 Try to install anyway, assuming `--ignore-pin-depends'? [Y/n] y
 local-with-pin-deps is now pinned to file://${BASEDIR}/local-with-pin-deps (version dev)
-The following additional pinnings are required by local-with-pin-deps.dev:
-  - pin-dep.dev at file://${BASEDIR}/pin-dep
-Pin and install them? [Y/n] n
-Try to install anyway, assuming `--ignore-pin-depends'? [Y/n] y
 The following actions will be performed:
 === install 2 packages
   - install local-with-pin-deps dev (pinned)
@@ -276,10 +268,6 @@ The following additional pinnings are required by local-with-pin-deps.dev:
 Pin and install them? [Y/n] n
 Try to install anyway, assuming `--ignore-pin-depends'? [Y/n] y
 local-with-pin-deps is now pinned to file://${BASEDIR}/local-with-pin-deps (version dev)
-The following additional pinnings are required by local-with-pin-deps.dev:
-  - pin-dep.dev at file://${BASEDIR}/pin-dep
-Pin and install them? [Y/n] n
-Try to install anyway, assuming `--ignore-pin-depends'? [Y/n] y
 
 <><> Installing new switch packages <><><><><><><><><><><><><><><><><><><><><><>
 Switch invariant: []
@@ -388,10 +376,6 @@ The following additional pinnings are required by local-with-pin-deps.dev:
 Pin and install them? [Y/n] n
 Try to install anyway, assuming `--ignore-pin-depends'? [Y/n] y
 local-with-pin-deps is now pinned to file://${BASEDIR}/local-with-pin-deps (version dev)
-The following additional pinnings are required by local-with-pin-deps.dev:
-  - pin-dep.dev at file://${BASEDIR}/pin-dep
-Pin and install them? [Y/n] n
-Try to install anyway, assuming `--ignore-pin-depends'? [Y/n] y
 
 <><> Installing new switch packages <><><><><><><><><><><><><><><><><><><><><><>
 Switch invariant: []