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

[Ralf Treinen]

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

    fix typ error, and missing \nl in warning

diff --git a/debian/changelog b/debian/changelog
index 511e3da..21b7e0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pkglab (1.4.2-3) unstable; urgency=low
+
+  * Issue a warning in case a package is mentioned in the 
+    -checkonly option but is not available (closes: #519859).
+
+ -- Ralf Treinen <treinen at debian.org>  Thu, 18 Jun 2009 22:35:42 +0200
+
 pkglab (1.4.2-2) unstable; urgency=low
 
   * Weaken conflict with edos-{rpm,deb}check to (<= 1.0-8) in order to
diff --git a/debian/manpages/edos-debcheck.1 b/debian/manpages/edos-debcheck.1
index de3979d..03468a3 100644
--- a/debian/manpages/edos-debcheck.1
+++ b/debian/manpages/edos-debcheck.1
@@ -58,10 +58,12 @@ Only show failures
 Only show successes
 .TP
 .BI -checkonly \ list
-check only for installability of all the versions of all packages in \fIlist\fR
-which is comma-separated list of package names. Note that if a package with
-a given name does not exist in the input package pool this means that all
-its versions are installable.
+where \fIlist\fR is a comma-separated list of package names.  Check only
+for installability of packages with name in \fIlist\fR (of any
+available version). This means that if a package does not exist in
+the input pool then the test passes (since all available versions are
+in that case installable). However, a warning is issued in case a package
+mentionend in \fIlist\fR is not available.
 .TP
 .B -quiet
 Supress warnings and progress/timing messages
diff --git a/distcheck/common.ml b/distcheck/common.ml
index 9c49077..b810f2c 100644
--- a/distcheck/common.ml
+++ b/distcheck/common.ml
@@ -103,25 +103,26 @@ end;;
 (* in case pkgs_to_check_set is true *)
 let check pkgs_only =
 let pkgs_to_check =
-  if !pkgs_to_check_only = [] 
+  if pkgs_only = [] 
   then ref (Package_set.diff (Functions.packages db) !not_to_check)
   else
-    let filtered_packages = 
+    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
+	List.map myunit_name_of (Package_set.elements filtered_packages)
     in let missing_package_names =   
 	List.filter
-	  (fun pn -> not (List.member pn found_package_names pn))
+	  (fun pn -> not (List.mem pn found_package_names))
 	  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
+	  missing_package_names;
+	prerr_newline ()
       end;
       ref filtered_packages
 in

-- 
pkglab packaging