Stop double pin of packages located in ./opam/opam

master_changes.md

@@ -46,6 +46,7 @@ users)
 
 ## Pin
   * [NEW] Make it so pin list display the current revision of a pinned repository in a new column [#6274 @desumn - fix #5533]
+  * [BUG] Stop double pin of packages located in ./opam/opam [#6343 @kit-ty-kate - fix #6342]
 
 ## List
 

src/state/opamPinned.ml

@@ -193,9 +193,8 @@ let files_in_source ?locked ?(recurse=false) ?subpath d =
       in
       List.fold_left
         (fun acc d ->
-           if OpamFilename.(basename_dir d = Base.of_string "opam") ||
-              OpamStd.String.ends_with ~suffix:".opam"
-                (OpamFilename.Dir.to_string d)
+           if OpamStd.String.ends_with ~suffix:".opam"
+               (OpamFilename.Dir.to_string d)
            then
              match OpamFilename.opt_file OpamFilename.Op.(d//"opam") with
              | None -> acc

tests/reftests/lock.test

@@ -386,13 +386,10 @@ Done.
 opam-version: "2.0"
 name: "silver"
 depends: "foo"
-### # ERROR double silver
+### : Make sure silver isn't pinned twice
 ### opam pin -n old
-This will pin the following packages: silver, silver. Continue? [Y/n] y
 Package silver does not exist, create as a NEW package? [Y/n] y
 silver is now pinned to file://${BASEDIR}/old (version dev)
-[NOTE] Package silver is already pinned to file://${BASEDIR}/old (version dev).
-silver is now pinned to file://${BASEDIR}/old (version dev)
 ### opam lock silver
 Generated lock files for:
   - silver.dev: ${BASEDIR}/silver.opam.locked