Fix Path.extract_build* functions when applied on the build_dir itself

This should fix #20
This commit is contained in:
Jérémie Dimino 2017-03-13 08:53:41 +00:00
parent ba08f27678
commit 1dcf38af93
1 changed files with 16 additions and 12 deletions

View File

@ -309,24 +309,28 @@ let is_in_build_dir t =
let extract_build_context t =
if is_local t && String.is_prefix t ~prefix:build_prefix then
let i = String.length build_prefix in
match String.index_from t i '/' with
| exception _ -> None
| j ->
Some
(String.sub t ~pos:i ~len:(j - i),
String.sub t ~pos:(j + 1) ~len:(String.length t - j - 1))
let j =
match String.index_from t i '/' with
| exception _ -> String.length t
| j -> j
in
Some
(String.sub t ~pos:i ~len:(j - i),
String.sub t ~pos:(j + 1) ~len:(String.length t - j - 1))
else
None
let extract_build_context_dir t =
if is_local t && String.is_prefix t ~prefix:build_prefix then
let i = String.length build_prefix in
match String.index_from t i '/' with
| exception _ -> None
| j ->
Some
(String.sub t ~pos:0 ~len:j,
String.sub t ~pos:(j + 1) ~len:(String.length t - j - 1))
let j =
match String.index_from t i '/' with
| exception _ -> String.length t
| j -> j
in
Some
(String.sub t ~pos:0 ~len:j,
String.sub t ~pos:(j + 1) ~len:(String.length t - j - 1))
else
None