X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Flibrary%2Flibrarian.ml;h=b765f64b65c37b4c4607ce66db06d5dd4c8e7524;hb=10f29fdd78ee089a9a94446207b543d33d6c851c;hp=376c8064974c73927258ebd913d55a8b16ca001c;hpb=aa665248454b1dcaf8cfe622dc1a159602119708;p=helm.git diff --git a/helm/software/components/library/librarian.ml b/helm/software/components/library/librarian.ml index 376c80649..b765f64b6 100644 --- a/helm/software/components/library/librarian.ml +++ b/helm/software/components/library/librarian.ml @@ -40,7 +40,10 @@ 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 + let clean s = + Pcre.replace ~pat:"[ \t]+" ~templ:" " + (Pcre.replace ~pat:"^ *" (Pcre.replace ~pat:" *$" s)) + in List.map (fun l -> match Str.split (Str.regexp "=") l with @@ -300,8 +303,12 @@ module Make = functor (F:Format) -> struct let local, remote = List.partition (fun (_,_,froot,_) -> froot = Some root) todo in - let local = List.filter (is_not_ro opts) local in - remote @ local + let local, skipped = List.partition (is_not_ro opts) local in + List.iter + (fun x -> + HLog.warn("Read only baseuri for: "^F.string_of_source_object(fst4 x))) + skipped; + remote @ local in if todo <> [] then let compiled, failed =