Small fix for 'autoremove'

Follows from ocaml#4969 and fixes ocaml#4727

master_changes.md

@@ -33,6 +33,7 @@ users)
 ## Remove
   *
   * Fix message when running `opam remove` on an unavailable package [@AltGr - fix #4890]
+  * Fix removal of root packages with `-a` and an optional dependency explicitely specified [@AltGr - fix #4727]
 
 ## Switch
   * Put back support for switch creation with packages argument and

src/client/opamClient.ml

@@ -1172,12 +1172,8 @@ let remove_t ?ask ~autoremove ~force atoms t =
     let requested = OpamPackage.names_of_packages packages in
     let to_remove =
       if autoremove then
-        let remove_cone =
-          packages |> OpamSolver.reverse_dependencies universe
-            ~build:true ~post:true ~depopts:false ~installed:true
-        in
         let keep =
-          universe.u_base ++ t.installed_roots %% t.installed -- remove_cone
+          universe.u_base ++ t.installed_roots %% t.installed -- packages
         in
         let keep_cone =
           keep |> OpamSolver.dependencies universe
@@ -1186,11 +1182,15 @@ let remove_t ?ask ~autoremove ~force atoms t =
         let autoremove =
           packages ++ (t.installed -- keep_cone)
         in
-        if atoms = [] then autoremove
-        else (* restrict to the dependency cone of removed pkgs *)
-          autoremove %%
-          (remove_cone |> OpamSolver.dependencies universe
-             ~build:true ~post:true ~depopts:false ~installed:true)
+        if atoms = [] then autoremove else
+        (* restrict to the dependency cone of removed pkgs *)
+        let remove_cone =
+          packages |> OpamSolver.reverse_dependencies universe
+            ~build:true ~post:true ~depopts:false ~installed:true
+        in
+        autoremove %%
+        (remove_cone |> OpamSolver.dependencies universe
+           ~build:true ~post:true ~depopts:false ~installed:true)
       else
         packages
     in

tests/reftests/basic.test

@@ -29,9 +29,9 @@ The following actions would be performed:
 Nothing to do.
 ### opam remove a --auto --show
 The following actions would be performed:
-  - remove c 1 [uses a]
-  - remove a 1
-===== 2 to remove =====
+  - remove    a 1
+  - recompile c 1 [uses a]
+===== 1 to recompile | 1 to remove =====
 ### :::::: message on removal of an unavailable package (#4890)
 ### <pkg:z.1>
 opam-version: "2.0"