Skip to content

Commit

Permalink
[fix] parse correctly settings with names (paparazzi#2604)
Browse files Browse the repository at this point in the history
the appear with a ~ in the settings list which should be removed before
testing for modules
  • Loading branch information
gautierhattenberger committed Oct 29, 2020
1 parent 6f216e3 commit 9dd0a81
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions sw/lib/ocaml/aircraft.ml
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,8 @@ let parse_aircraft = fun ?(parse_af=false) ?(parse_ap=false) ?(parse_fp=false) ?
let settings_modules = List.fold_left
(fun acc m ->
if List.exists (fun name ->
let name = List.hd (Str.split (Str.regexp "~") name) in
(* FIXME use correctly the settings name in filtered settings ? *)
m.Module.xml_filename = (if Filename.is_relative name
then (Env.paparazzi_conf // name) else name)) settings_modules_files
then acc @ m.Module.settings else acc
Expand Down

0 comments on commit 9dd0a81

Please sign in to comment.