[fix] file.ml: revert to previous check_create_path behavioour

see commit 97e53b1
MLstate · Nov 27, 2012 · f771f1f · f771f1f
1 parent 7bcd8f6
commit f771f1f
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/ocamllib/libbase/file.ml b/ocamllib/libbase/file.ml
@@ -1,5 +1,5 @@
 (*
-    Copyright © 2011 MLstate
+    Copyright © 2011, 2012 MLstate
 
     This file is part of Opa.
 
@@ -324,20 +324,21 @@ let rec remove_all_symlinks path =
 
 (** create all necessary directories to access a file path *)
 let rec check_create_path ?(rights=0o755) ?(nobackslash=true) ?(isdirectory=false) path =
+  let path = remove_all_symlinks path in
   let path = if isdirectory then Filename.concat path "test" else path in
   let path = if nobackslash then Base.String.map (fun c -> if c='\\' then '/' else c) path else path in
   let dirname = Filename.dirname path in
   if dirname=path || dirname=".." || path="." || path="/" then (
     true (*terminal case*)
-  ) else 
+  ) else
     try
       Sys.is_directory dirname || (
         failwith ("Not a directory but exists: "^dirname)
       )
       (* terminal case *)
     with Sys_error _ -> (
-      check_create_path ~rights dirname 
+      check_create_path ~rights dirname
-      && (try Unix.mkdir dirname rights; true with Unix.Unix_error _ -> Printf.printf "mkdir error%s\n" dirname; false)
+      && (try Unix.mkdir dirname rights; true with Unix.Unix_error _ -> Printf.printf "mkdir error %s\n" dirname; false)
     )
 
 (** hopefully, this is the ultimate and portable version of cp *)