- better handling of temp files wrt to failures. When a temp file has

[helm.git] / helm / ocaml / getter / http_getter_common.ml

diff --git a/helm/ocaml/getter/http_getter_common.ml b/helm/ocaml/getter/http_getter_common.ml
index 6ecc75f8155edcc952b4ff7725423ab0cf1bb833..1ee74c103b1e1948e309becc04d027f45d3a9347 100644 (file)
--- a/helm/ocaml/getter/http_getter_common.ml
+++ b/helm/ocaml/getter/http_getter_common.ml
@@ -118,17 +118,21 @@ let return_file
     let (tmp1, tmp2) =
       (Http_getter_misc.tempfile (), Http_getter_misc.tempfile ())
     in
-    Http_getter_misc.gunzip ~keep:true ~output:tmp1 fname;  (* gunzip to tmp1 *)
-    let new_file = open_out tmp2 in
-    Http_getter_misc.iter_file  (* tmp2 = patch(tmp1) *)
-      (fun line -> output_string new_file (patch_fun line ^ "\n"))
-      tmp1;
-    close_out new_file;
-    Http_getter_misc.gzip ~output:tmp1 tmp2;  (* tmp1 = gzip(tmp2); rm tmp2 *)
-    Http_getter_misc.iter_file  (* send tmp1 to client as is*)
-      (fun line -> output_string outchan (line ^ "\n"))
-      tmp1;
-    Sys.remove tmp1       (* rm tmp1 *)
+    try
+      Http_getter_misc.gunzip ~keep:true ~output:tmp1 fname;(* gunzip to tmp1 *)
+      let new_file = open_out tmp2 in
+      Http_getter_misc.iter_file  (* tmp2 = patch(tmp1) *)
+        (fun line -> output_string new_file (patch_fun line ^ "\n"))
+        tmp1;
+      close_out new_file;
+      Http_getter_misc.gzip ~output:tmp1 tmp2;  (* tmp1 = gzip(tmp2); rm tmp2 *)
+      Http_getter_misc.iter_file  (* send tmp1 to client as is*)
+        (fun line -> output_string outchan (line ^ "\n"))
+        tmp1;
+      Sys.remove tmp1       (* rm tmp1 *)
+    with e ->
+      Sys.remove tmp1;
+      raise e
   end else  (* no need to gunzip, apply patch_fun directly to file *)
     Http_getter_misc.iter_file
       (fun line -> output_string outchan (patch_fun line ^ "\n"))