robur/opam-mirror
4
0
Fork 0
Code Issues 6 Pull requests 2 Projects Releases Packages Wiki Activity Actions

Merge pull request 'use git-kv 0.0.5+ API for to/of_octets' (#17) from git-kv-05 into main

Browse source 
Reviewed-on: #17
Reviewed-by: Reynir Björnsson <reynir@reynir.dk>
This commit is contained in:
Hannes Mehnert 2024-11-08 14:41:12 +00:00
commit 921ee6b684
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mirage/config.ml
View file

@ -8,7 +8,7 @@ let mirror =
package "h2" ; package "h2" ;
package "ohex" ; package "ohex" ;
package "httpaf" ; package "httpaf" ;
package ~max:"0.0.5" "git-kv" ; package ~min:"0.0.5" "git-kv" ;
package ~min:"3.10.0" "git-paf" ; package ~min:"3.10.0" "git-paf" ;
package "opam-file-format" ; package "opam-file-format" ;
package ~min:"3.0.0" ~sublibs:[ "gz" ] "tar" ; package ~min:"3.0.0" ~sublibs:[ "gz" ] "tar" ;

7
mirage/unikernel.ml
View file

@ -902,7 +902,9 @@ stamp: %S
Logs.info (fun m -> m "downloading of %d urls done" (SM.cardinal urls)) Logs.info (fun m -> m "downloading of %d urls done" (SM.cardinal urls))
let dump_git git_dump git_kv = let dump_git git_dump git_kv =
Git_kv.to_octets git_kv >>= fun data -> let stream = Git_kv.to_octets git_kv in
Lwt_stream.to_list stream >>= fun datas ->
let data = String.concat "" datas in
Cache.write git_dump data >|= function Cache.write git_dump data >|= function
| Ok () -> | Ok () ->
Logs.info (fun m -> m "dumped git %d bytes" (String.length data)) Logs.info (fun m -> m "dumped git %d bytes" (String.length data))
@ -916,7 +918,8 @@ stamp: %S
Logs.warn (fun m -> m "failed to read git state: %a" Cache.pp_error e); Logs.warn (fun m -> m "failed to read git state: %a" Cache.pp_error e);
Lwt.return (Error ()) Lwt.return (Error ())
| Ok Some data -> | Ok Some data ->
Git_kv.of_octets git_ctx ~remote data >|= function let stream = Lwt_stream.return data in
Git_kv.of_octets git_ctx ~remote stream >|= function
| Ok git_kv -> Ok git_kv | Ok git_kv -> Ok git_kv
| Error `Msg msg -> | Error `Msg msg ->
Logs.err (fun m -> m "error restoring git state: %s" msg); Logs.err (fun m -> m "error restoring git state: %s" msg);