X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=components%2Flibrary%2Flibrarian.ml;fp=components%2Flibrary%2Flibrarian.ml;h=f2268488f2afbc3ce975578c072a172af1ec72ac;hb=df666eb58afe0b312a2c4d41683d7ae4828ee8bd;hp=9a16e814d56527354b66d4e8d5d5bdc6477795a3;hpb=bd258ecf3eae6aef4ff6b1d1dd8e1c8c2bb17677;p=helm.git diff --git a/components/library/librarian.ml b/components/library/librarian.ml index 9a16e814d..f2268488f 100644 --- a/components/library/librarian.ml +++ b/components/library/librarian.ml @@ -38,10 +38,11 @@ let remove_trailing_slash s = let load_root_file rootpath = let data = HExtlib.input_file rootpath in let lines = Str.split (Str.regexp "\n") data in + let clean s = Pcre.replace ~pat:"^ *" (Pcre.replace ~pat:" *$" s) in List.map (fun l -> match Str.split (Str.regexp "=") l with - | [k;v] -> Pcre.replace ~pat:"^ *" k, Pcre.replace ~pat:" *$" v + | [k;v] -> clean k, Http_getter_misc.strip_trailing_slash (clean v) | _ -> raise (Failure ("Malformed root file: " ^ rootpath))) lines ;;