bugfix to developments:

[helm.git] / helm / software / components / grafite_parser / dependenciesParser.ml

diff --git a/helm/software/components/grafite_parser/dependenciesParser.ml b/helm/software/components/grafite_parser/dependenciesParser.ml
index dee9511182333c36d1ff7412f3c6498103e1b475..74cf0aa774333592b5ed396aab97581a38cd678b 100644 (file)
--- a/helm/software/components/grafite_parser/dependenciesParser.ml
+++ b/helm/software/components/grafite_parser/dependenciesParser.ml
@@ -43,6 +43,7 @@ let parse_dependencies lexbuf =
     CicNotationLexer.level2_ast_lexer.Token.tok_func (Obj.magic lexbuf)
   in
   let rec parse acc = 
+   try
     (parser
     | [< '("URI", u) >] ->
         parse (UriDep (UriManager.uri_of_string u) :: acc)
@@ -53,6 +54,8 @@ let parse_dependencies lexbuf =
     | [< '("EOI", _) >] -> acc
     | [< 'tok >] -> parse acc
     | [<  >] -> acc) tok_stream
+   with
+    Stream.Error _ -> parse acc
   in
   List.rev (parse [])
 
@@ -83,10 +86,4 @@ let baseuri_of_script ~include_paths file =
  let uri = Http_getter_misc.strip_trailing_slash buri in
  if String.length uri < 5 || String.sub uri 0 5 <> "cic:/" then
    HLog.error (file ^ " sets an incorrect baseuri: " ^ buri);
- (try 
-   ignore(Http_getter.resolve ~writable:false uri)
- with
- | Http_getter_types.Unresolvable_URI _ -> 
-     HLog.error (file ^ " sets an unresolvable baseuri: " ^ buri)
- | Http_getter_types.Key_not_found _ -> ());
- uri
+ uri,file