[Pkg-ocaml-maint-commits] r1820 - in trunk/projects/approx/trunk: . debian

[Eric Cooper]

Author: ecc-guest
Date: 2005-10-10 14:32:36 +0000 (Mon, 10 Oct 2005)
New Revision: 1820

Modified:
   trunk/projects/approx/trunk/approx.ml
   trunk/projects/approx/trunk/debian/control
Log:
update libsyslog-ocaml-dep version dependency


Modified: trunk/projects/approx/trunk/approx.ml
===================================================================
--- trunk/projects/approx/trunk/approx.ml	2005-10-10 08:19:05 UTC (rev 1819)
+++ trunk/projects/approx/trunk/approx.ml	2005-10-10 14:32:36 UTC (rev 1820)
@@ -257,40 +257,43 @@
   match !cache_chan with
   | None -> assert false
   | Some chan ->
-      if debug then debug_message "  close cache %s" !cache_file;
+      let real_name = !cache_file in
+      let tmp_name = !tmp_cache_file in
+      if debug then debug_message "  close cache %s" real_name;
       close_out chan;
       cache_chan := None;
       try
-	if size = -1 || size = file_size !tmp_cache_file then
+	if size = -1 || size = file_size tmp_name then
 	  begin
-	    Sys.rename !tmp_cache_file !cache_file;
+	    Sys.rename tmp_name real_name;
 	    if mod_time <> 0. then
 	      begin
 		if debug then
 		  debug_message "  setting mtime to %s"
 		    (string_of_time mod_time);
-		utimes !cache_file mod_time mod_time
+		utimes real_name mod_time mod_time
 	      end
 	  end
 	else
 	  begin
-	    error_message "Size of %s should be %d" !cache_file size;
-	    Sys.remove !tmp_cache_file
+	    error_message "Size of %s should be %d, not %d"
+	      real_name size (file_size tmp_name);
+	    Sys.remove tmp_name
 	  end
       with e ->
 	(* gc_approx or another approx process might have removed .tmp file *)
-	error_message "Cannot close cache file %s" !cache_file;
+	error_message "Cannot close cache file %s" real_name;
 	exception_message e
 
 let remove_cache () =
   match !cache_chan with
   | None -> ()
   | Some chan ->
-      let name = !tmp_cache_file in
+      let tmp_name = !tmp_cache_file in
       close_out chan;
       cache_chan := None;
-      error_message "Removing %s (size: %d)" name (file_size name);
-      Sys.remove name
+      error_message "Removing %s (size: %d)" tmp_name (file_size tmp_name);
+      Sys.remove tmp_name
 
 type download_status =
   | Delivered

Modified: trunk/projects/approx/trunk/debian/control
===================================================================
--- trunk/projects/approx/trunk/debian/control	2005-10-10 08:19:05 UTC (rev 1819)
+++ trunk/projects/approx/trunk/debian/control	2005-10-10 14:32:36 UTC (rev 1820)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Eric Cooper <ecc at cmu.edu>
 Uploaders: Sven Luther <luther at debian.org>, Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>= 4.0), ocaml-nox-3.08.3, ocaml-best-compilers, ocaml-tools, libcurl-ocaml-dev (>= 0.2.1), libhttp-ocaml-dev (>= 0.1.1), libocamlnet-ocaml-dev (>= 1.1), libpcre-ocaml-dev (>= 5.10.0), libsyslog-ocaml-dev (>= 1.0-3)
+Build-Depends: debhelper (>= 4.0), ocaml-nox-3.08.3, ocaml-best-compilers, ocaml-tools, libcurl-ocaml-dev (>= 0.2.1), libhttp-ocaml-dev (>= 0.1.1), libocamlnet-ocaml-dev (>= 1.1), libpcre-ocaml-dev (>= 5.10.0), libsyslog-ocaml-dev (>= 1.2)
 Standards-Version: 3.6.2
 
 Package: approx