[Pkg-ocaml-maint-commits] [SCM] approx upstream and debian packaging branch, master, updated. upstream/3.5-103-g447143e

[Eric Cooper]

The following commit has been merged in the master branch:
commit 436a865742ebb2bf159f1b1ed9e072fa1df58943
Author: Eric Cooper <ecc at cmu.edu>
Date:   Sat Mar 7 20:05:52 2009 -0500

    revert to using drop_privileges instead of just check_id

diff --git a/gc.ml b/gc.ml
index 50e822f..b926f3d 100644
--- a/gc.ml
+++ b/gc.ml
@@ -170,7 +170,7 @@ let rec prune () =
   | list -> List.iter remove_dir list; if not simulate then prune ()
 
 let garbage_collect () =
-  if not simulate then check_id ~user ~group;
+  if not simulate then drop_privileges ~user ~group;
   mark ();
   sweep ();
   prune ()
diff --git a/import.ml b/import.ml
index 6d259a7..44f32b7 100644
--- a/import.ml
+++ b/import.ml
@@ -119,7 +119,7 @@ let import_files index =
     Control_file.iter check_package index
 
 let import () =
-  if not simulate then check_id ~user ~group;
+  if not simulate then drop_privileges ~user ~group;
   scan_files ();
   iter_non_dirs import_files cache_dir;
   print_if (not !index_seen) "%s"
diff --git a/update.ml b/update.ml
index fe0514a..9d799ed 100644
--- a/update.ml
+++ b/update.ml
@@ -84,7 +84,7 @@ let update_file file =
     | e -> print "%s: %s" file (string_of_exception e)
 
 let update_cache () =
-  if not simulate then check_id ~user ~group;
+  if not simulate then drop_privileges ~user ~group;
   if files <> [] then List.iter update_file files
   else iter_non_dirs update_file cache_dir
 

-- 
approx upstream and debian packaging