[Pkg-ocaml-maint-commits] [SCM] pkglab packaging branch, master, updated. debian/1.4.2-2-4-gb69e5b3

Ralf Treinen treinen at free.fr
Thu Jun 18 20:49:23 UTC 2009


The following commit has been merged in the master branch:
commit 7c6e58c6692b632af23835b73fc50d567e0585d1
Author: Ralf Treinen <treinen at free.fr>
Date:   Thu Jun 18 22:11:07 2009 +0200

    add code to warn when packages requested but not existant

diff --git a/distcheck/common.ml b/distcheck/common.ml
index c748ed3..9c49077 100644
--- a/distcheck/common.ml
+++ b/distcheck/common.ml
@@ -99,14 +99,31 @@ begin
 	| Sel_GT v -> Printf.sprintf " (&gt; %s)" (version_string v) 
 end;;
 
-(* the check will be restricte to the packages whose names are in pkgs_only, in case pkgs_to_check_set is true *)
+(* the check will be restricted to the packages whose names are in pkgs_only, *)
+(* in case pkgs_to_check_set is true *)
 let check pkgs_only =
 let pkgs_to_check =
   if !pkgs_to_check_only = [] 
   then ref (Package_set.diff (Functions.packages db) !not_to_check)
-  else ref (Package_set.filter
-	      (fun p -> List.mem  (myunit_name_of p) pkgs_only)
-	      (Functions.packages db))
+  else
+    let filtered_packages = 
+      (Package_set.filter
+	 (fun p -> List.mem  (myunit_name_of p) pkgs_only)
+	 (Functions.packages db))
+    in let found_package_names =
+	List.map myunit_name_of filtered_packages
+    in let missing_package_names =   
+	List.filter
+	  (fun pn -> not (List.member pn found_package_names pn))
+	  pkgs_only
+    in if missing_package_names <> []
+      then begin
+	prerr_string "Warning: some packages not found:";
+	List.iter
+	  (fun pn -> prerr_char ' '; prerr_string pn) 
+	  missingpackage_names
+      end;
+      ref filtered_packages
 in
 let result_ht = Hashtbl.create (Package_set.cardinal !pkgs_to_check) in
 let progress =

-- 
pkglab packaging



More information about the Pkg-ocaml-maint-commits mailing list