Merge pull request #4449 from Blaisorblade/openssl-fallback

openssl invocation: Fix fallback (part of #4448)
ocaml · Nov 26, 2020 · e93dd4a · e93dd4a
2 parents 51c160b + afa1622
commit e93dd4a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/master_changes.md b/master_changes.md
@@ -98,6 +98,7 @@ New option/command/subcommand are prefixed with ◈.
   * Initialise random [#4391 @rjbou]
   * Fix CLI debug log printed without taking into account debug sections [#4391 @rjbou]
   * Internal caches: use size checks from Marshal [#4430 @AltGr]
+  * openssl invocation: Fix permission denied fallback [#4449 @Blaisorblade - fix #4448]
 
 ## Test
   * Ensure that a cold `dune runtest` works [#4375 @emillon]

diff --git a/src/core/opamHash.ml b/src/core/opamHash.ml
@@ -104,7 +104,7 @@ let compute ?(kind=default_kind) file = match kind with
         | _ ->
           log "openssl error, use internal sha library";
           OpamSHA.hash kind file
-      with OpamSystem.Command_not_found _ | OpamSystem.Process_error _ ->
+      with OpamSystem.Command_not_found _ | OpamSystem.Process_error _ | OpamSystem.Permission_denied _ ->
         log "openssl not found, use internal sha library";
         OpamSHA.hash kind file
     in

diff --git a/src/core/opamSystem.mli b/src/core/opamSystem.mli
@@ -16,6 +16,8 @@ exception Process_error of OpamProcess.result
 
 exception Command_not_found of string
 
+exception Permission_denied of string
+
 (** raise [Process_error] *)
 val process_error: OpamProcess.result -> 'a