[Pkg-ocaml-maint-commits] [SCM] approx upstream and debian packaging branch, upstream, updated. upstream/3.5-41-g482c98d

[Eric Cooper]

The following commit has been merged in the upstream branch:
commit b3f526360f651e9b6fc4f318832ca85d8a10fd90
Author: Eric Cooper <ecc at cmu.edu>
Date:   Sun Jun 20 13:27:23 2010 -0400

    minor cleanup

diff --git a/_tags b/_tags
index f1f9cd1..38a31b5 100644
--- a/_tags
+++ b/_tags
@@ -1,5 +1,5 @@
 # approx: proxy server for Debian archive files
-# Copyright (C) 2009  Eric C. Cooper <ecc at cmu.edu>
+# Copyright (C) 2010  Eric C. Cooper <ecc at cmu.edu>
 # Released under the GNU General Public License
 
 <**/*.{mli,ml}>: warn_error_A
@@ -8,8 +8,6 @@
 <config_file.ml>: use_pcre
 <import.ml>: use_pcre
 <log.ml>: use_syslog
-<server.mli>: use_nethttpd-for-netcgi2
-<server.ml>: use_netstring, use_netcgi, use_nethttpd-for-netcgi2
 <url.ml>: use_netstring
 <util.ml>: use_pcre, use_sha
 
diff --git a/gc.ml b/gc.ml
index b0fd865..666b799 100644
--- a/gc.ml
+++ b/gc.ml
@@ -139,11 +139,11 @@ let sweep () =
   let gc file = function
     | Some Control_file.Valid -> ()
     | status ->
-        if inactive file then begin
-          print_gc file status;
-          if not simulate then perform Sys.remove file
-        end else
-          if verbose then print "%s: not old enough to remove" (shorten file)
+        if inactive file then
+          (print_gc file status;
+           if not simulate then perform Sys.remove file)
+        else if verbose then
+          print "%s: not old enough to remove" (shorten file)
   in
   iter_status gc
 
@@ -158,9 +158,8 @@ let empty_dirs =
   fold_dirs collect_empty []
 
 let remove_dir dir =
-  if not quiet then begin
-    print "%s%s" (shorten dir) (if verbose then ": empty directory" else "/")
-  end;
+  if not quiet then
+    print "%s%s" (shorten dir) (if verbose then ": empty directory" else "/");
   (* any exception raised by rmdir will terminate the pruning loop *)
   if not simulate then perform Unix.rmdir dir
 

-- 
approx upstream and debian packaging