[paparazzi-commits] [4199] fix bug occuring with unexpected filenames in var/maps

[Pascal Brisset]

Revision: 4199
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4199
Author:   hecto
Date:     2009-09-24 17:13:58 +0000 (Thu, 24 Sep 2009)
Log Message:
-----------
 fix bug occuring with unexpected filenames in var/maps

Modified Paths:
--------------
    paparazzi3/trunk/sw/lib/ocaml/gm.ml

Modified: paparazzi3/trunk/sw/lib/ocaml/gm.ml
===================================================================
--- paparazzi3/trunk/sw/lib/ocaml/gm.ml 2009-09-23 19:15:40 UTC (rev 4198)
+++ paparazzi3/trunk/sw/lib/ocaml/gm.ml 2009-09-24 17:13:58 UTC (rev 4199)
@@ -145,10 +145,10 @@
   let rec loop = fun i ->
     if i < Array.length files then
       let fi = files.(i) in
-      let fi_key = Filename.chop_extension fi in
-      if try is_prefix fi_key f with _ -> false then begin
+      let fi_key = try Filename.chop_extension fi with _ -> fi in
+      if fi_key <> "" && is_prefix fi_key f then
        (tile_of_key fi_key, !cache_path // fi)
-      end else
+      else
        loop (i+1)
     else
       raise Not_found in