Ensure opamfiles are counted in prep hash

jonludlam · jonludlam · commit e41992e3e7cb · 2025-05-19T13:51:11.000+01:00
diff --git a/src/lib/prep.ml b/src/lib/prep.ml
@@ -483,10 +483,19 @@ module Prep = struct
       opamfiles : (bool * string) Current.or_error OpamPackage.Map.t;
     }
 
-    let digest { prep; base = _; tools_base = _; config = _; opamfiles = _ } =
+    let digest { prep; base = _; tools_base = _; config = _; opamfiles } =
       (* base is derived from 'prep' so we don't need to include it in the hash *)
-      Fmt.str "%s\n%s\n%s\n" prep_version (Package.digest prep)
-        (Package.digest prep)
+      let opamfiles_hash =
+        let buf = Buffer.create 1024 in
+        let () = OpamPackage.Map.iter (fun _ x ->
+          match x with
+          | Ok (_has_depext, opamfile) ->
+              Buffer.add_string buf opamfile
+          | _ -> ()) opamfiles in
+        Hashtbl.hash (Buffer.contents buf)
+      in
+      Fmt.str "%s\n%s\n%s\n%d\n" prep_version (Package.digest prep)
+        (Package.digest prep) opamfiles_hash
   end
 
   let pp f Key.{ prep; _ } = Fmt.pf f "Voodoo prep %a" Package.pp prep
