The following commit has been merged in the master branch:
commit 51ffadd1c4499842c548204577d8d08e05c4c4b2
Author: Ralf Treinen <trei...@debian.org>
Date: Fri Sep 30 16:15:47 2011 +0200
Create quilt patches for modifications to upstream files
diff --git a/debian/changelog b/debian/changelog
index e3c8424..c71175c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ pkglab (1.4.2-13) UNRELEASED; urgency=low
* edos-distcheck: add dependency on ${python:Depends}
* Fix a grammar error in the pkglab doc-base file
* Standards-Version: 3.9.2 (no change)
+ * Put changes to upstream files as quilt patches (closes: #643249)
- -- Ralf Treinen <trei...@debian.org> Thu, 29 Sep 2011 16:50:24 +0200
+ -- Ralf Treinen <trei...@debian.org> Fri, 30 Sep 2011 16:12:40 +0200
pkglab (1.4.2-12) unstable; urgency=low
diff --git a/debian/patches/clean-cmi b/debian/patches/clean-cmi
new file mode 100644
index 0000000..8d83f19
--- /dev/null
+++ b/debian/patches/clean-cmi
@@ -0,0 +1,16 @@
+Description: "make clean" should also remove .cmi files
+Author: Ralf Treinen <trei...@debian.org>
+
+Index: pkglab/distcheck/Makefile
+===================================================================
+--- pkglab.orig/distcheck/Makefile 2011-09-30 16:06:53.000000000 +0200
++++ pkglab/distcheck/Makefile 2011-09-30 16:07:08.000000000 +0200
+@@ -37,7 +37,7 @@
+ cp pscheck.opt $(BINDIR)
+
+ clean:
+- rm -f distcheck distcheck.opt *.o *.cmo *.cmx
++ rm -f distcheck distcheck.opt *.o *.cmo *.cmx *.cmi
+
+ %.cmo: %.ml
+ $(OCAMLC) -o $@ -c $^
diff --git a/debian/patches/quoted-version b/debian/patches/quoted-version
new file mode 100644
index 0000000..98ab311
--- /dev/null
+++ b/debian/patches/quoted-version
@@ -0,0 +1,40 @@
+Description: Fix missing quotes before versions in documentation
+ and help
+Author: Ralf Treinen <trei...@debian.org>
+Debian-Bug: #532771
+
+--- pkglab-1.4.2.orig/doc/pkglab.tex
++++ pkglab-1.4.2/doc/pkglab.tex
+@@ -83,10 +83,10 @@ Pkglab knows several different types of
+ sets; used to track the contents of a distribution through times
+ \item[Dates] (denoted: {\tt YYYY-MM-DD})
+ \item[Date ranges] (denoted: {\tt [YYYY-MM-DD;YYYY-MM-DD]})
+- \item[Specifications] (denoted: {\tt [. kde (>= 5.2) .]}) A selector
++ \item[Specifications] (denoted: {\tt [. kde (>= '5.2) .]}) A selector
+ on the versions of a unit, in this case all versions of the unit {\tt kde}
+ greater than or equal to {\tt 5.2}. The version is optional;
+- {\tt [. kde .]} is a valid specification as well.
++ {\tt [. kde .]} is a valid specification as well. The spaces between the
{\tt [.} brackets and the specification are necessary!
+ \item[Sets] (denoted: {\tt \{a, b, \ldots\}})
+ \item[Diagnoses] The result of a check operation: a list of packages that
+ are not installable with their reasons.
+@@ -98,7 +98,7 @@ It is possible to use variables: like in
+ prefixed by a dollar sign ({\tt \$}). Assignment is done as follows:
+
+ \codebox{
+-> \$a <- select([. kde (>= 5.2) .])
++> \$a <- select([. kde (>= '5.2) .])
+ }
+
+ Pkglab has the following operators:
+--- pkglab-1.4.2.orig/dql/help.ml
++++ pkglab-1.4.2/dql/help.ml
+@@ -62,7 +62,7 @@ let help_string =
+ Simple " $"; Red "name"; Tab; Tab; Tab; Tab; Simple
"Variable"; Newline;
+ Simple " "; Red "yyyy"; Simple "-"; Red "mm"; Simple "-"; Red
"dd"; Tab; Tab; Tab; Simple "Date"; Newline;
+ Simple " ["; Red "date1"; Simple ";"; Red "date2"; Simple "]";
Tab; Tab; Tab; Simple "Date range"; Newline;
+- Simple " [."; Red "unit"; Simple "("; Red "operator version";
Simple ").]"; Tab; Simple "Version specification (e.g. [.kde (>= 5.2).])";
Newline;
++ Simple " [."; Red "unit"; Simple "("; Red "operator version";
Simple ").]"; Tab; Simple "Version specification (e.g. [. kde (>= '5.2) .])";
Newline;
+ Tab; Tab; Tab; Tab; Simple "(version part is optional)";
Newline;
+ Simple " {"; Red "e1"; Simple ","; Red "e2"; Simple ","; Red
"..."; Simple ","; Red "en"; Simple "}"; Tab; Tab; Simple "Set construction";
Newline;
+ Simple " "; Red "set1"; Simple "|"; Red "set2"; Simple " ";
Red "set1"; Simple "&"; Red "set2"; Simple " "; Red "set1"; Simple "\\"; Red
"set2"; Tab; Simple "Set union/intersection/difference"; Newline;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5e885f3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+quoted-version
+clean-cmi
+various
diff --git a/debian/patches/various b/debian/patches/various
new file mode 100644
index 0000000..f9376a2
--- /dev/null
+++ b/debian/patches/various
@@ -0,0 +1,280 @@
+Desccription: Fix XML output, add some options to distcheck
+Author: Ralf Treinen <trei...@debian.org>
+
+--- pkglab-1.4.2.orig/distcheck/Makefile
++++ pkglab-1.4.2/distcheck/Makefile
+@@ -4,7 +4,7 @@ SRCS= common.ml
+ OBJS= $(SRCS:.ml=.cmo)
+ XBJS= $(SRCS:.ml=.cmx)
+
+-PACKAGES= dose2.packetology,dose2.rapids
++PACKAGES= dose2.packetology,dose2.rapids,str
+
+ OCAMLC= ocamlfind ocamlc -package $(PACKAGES)
+ OCAMLOPT= ocamlfind ocamlopt -package $(PACKAGES)
+--- pkglab-1.4.2.orig/distcheck/common.ml
++++ pkglab-1.4.2/distcheck/common.ml
+@@ -7,20 +7,31 @@ open Diagnosis
+ open Napkin
+ open Rapids
+ open Waterway
++open Str
+
+ let show_successes = ref true
+ and show_failures = ref true
+ and explain_results = ref false
+ and quiet = ref false
+ and output_xml= ref false
+-and dist_type = ref `Debian
+-and source_added = ref false;;
++and dist_type = ref `Debian;;
++let pkgs_to_check = ref Package_set.empty;;
++let units_to_check = ref [] (* units given by command line argument *)
++and units_to_check_set = ref false (* indicates whether units_to check set
on command line *)
++and packages_are_missing = ref false;; (* indicates that some packages that
were asked to be *)
++ (* checked are not available. *)
++let checklist = ref [];;
++let rpm_synthesis = ref false;;
+
+ let db = create_database ();;
+ let architecture_index = get_architecture_index db;;
+ let unit_index = get_unit_index db;;
+ let package_index = get_package_index db;;
++let version_index = get_version_index db;;
++let release_index = get_release_index db;;
++let source_index = get_source_index db;;
+ let not_to_check = ref Package_set.empty;;
++let tmpfile = ref "";; (* temporary file for input *)
+
+ let add_source add_to_check s =
+ let merge x = if !quiet then
+@@ -28,21 +39,23 @@ let merge x = if !quiet then
+ else
+ Waterway.merge db x in
+ begin
+- source_added := true;
+ (* This is not very effective, but hey... *)
+ let pkgs_old = Functions.packages db in
+ (let s2 = if s = "-" then
+ begin
+- let (n, c) = Filename.open_temp_file "distcheck" "" in
++ let (n, c) = Filename.open_temp_file "distcheck"
++ (if !rpm_synthesis then "synthesis" else "")
++ in
+ begin
+- try
+- while true
+- do
+- Printf.fprintf c "%s\n" (read_line ())
+- done
+- with End_of_file -> close_out c
+- end;
+- n
++ tmpfile := n;
++ try
++ while true
++ do
++ Printf.fprintf c "%s\n" (read_line ())
++ done
++ with End_of_file -> close_out c;
++ end;
++ n
+ end
+ else s in
+ match !dist_type with
+@@ -54,6 +67,31 @@ begin
+ not_to_check := Package_set.union !not_to_check new_packages
+ end;;
+
++let add_pkg_to_check s =
++begin
++ try
++ let eq = String.index s '=' in
++ let u = String.sub s 0 eq in
++ let unit_id = Unit_index.search unit_index u in
++ let v = String.sub s (eq+1) (String.length s-eq-1) in
++ let (v_id, r_id) =
++ try
++ let dash = String.rindex v '-' in
++ let rv = String.sub v 0 dash
++ and r = String.sub v (dash+1) (String.length v-dash-1) in
++ (Version_index.search version_index rv,
++ Release_index.search release_index (Some r))
++ with Not_found -> (Version_index.search version_index v,
++ Release_index.search release_index None) in
++ let ps = Functions.unit_id_to_package_set db unit_id in
++ Package_set.iter (fun p_id ->
++ let pkg = Functions.get_package_from_id db p_id in
++ if pkg.pk_version = (v_id, r_id) then
++ pkgs_to_check := Package_set.add p_id !pkgs_to_check
++ ) ps;
++ with Not_found -> ()
++end;;
++
+ let unit_name_of u_id =
+ Unit_index.find unit_index u_id;;
+
+@@ -67,6 +105,15 @@ let pkg_name_of p_id =
+ | None -> ""
+ | Some rn -> "-" ^ rn);;
+
++let myunit_name_of p_id =
++ let (_, pkg) = Package_index.find package_index p_id in
++ Unit_index.find unit_index pkg.pk_unit
++
++(* gives the name of the source of a package *)
++let source_name_of p_id =
++ let (_, pkg) = Package_index.find package_index p_id in
++ fst (Source_index.find source_index pkg.pk_source)
++
+ let pkg_xml_of p_id =
+ let (_, pkg) = Package_index.find package_index p_id in
+ let unit_name = Unit_index.find unit_index pkg.pk_unit
+@@ -79,23 +126,37 @@ let pkg_xml_of p_id =
+ | None -> ""
+ | Some rn -> "-" ^ rn);;
+
++(* xmlesc escapes some special caracters into XML *)
++let xmlesc s =
++ global_replace (regexp_string ">") ">"
++ (global_replace (regexp_string "<") "<" s)
++;;
++
+ let spec_string s =
+-let version_string (v, r) =
+- let vn = Version_index.get_version v
+- and rn = Release_index.get_version r in
+- vn ^ (match rn with None -> "" | Some r -> r) in
+-begin
+- match s with
++ let version_string (v, r) =
++ let vn = Version_index.get_version v
++ and rn = Release_index.get_version r in
++ vn ^ (match rn with None -> "" | Some r -> ("-"^r)) in
++ if !output_xml
++ then
++ match s with
+ | Sel_ANY -> ""
+- | Sel_LT v -> Printf.sprintf " (< %s)" (version_string v)
+- | Sel_LEQ v -> Printf.sprintf " (<= %s)" (version_string v)
++ | Sel_LT v -> Printf.sprintf " (< %s)" (xmlesc (version_string v))
++ | Sel_LEQ v -> Printf.sprintf " (<= %s)" (xmlesc (version_string v))
++ | Sel_EQ v -> Printf.sprintf " (= %s)" (xmlesc (version_string v))
++ | Sel_GEQ v -> Printf.sprintf " (>= %s)" (xmlesc (version_string v))
++ | Sel_GT v -> Printf.sprintf " (> %s)" (xmlesc (version_string v))
++ else
++ match s with
++ | Sel_ANY -> ""
++ | Sel_LT v -> Printf.sprintf " (< %s)" (version_string v)
++ | Sel_LEQ v -> Printf.sprintf " (<= %s)" (version_string v)
+ | Sel_EQ v -> Printf.sprintf " (= %s)" (version_string v)
+- | Sel_GEQ v -> Printf.sprintf " (>= %s)" (version_string v)
+- | Sel_GT v -> Printf.sprintf " (> %s)" (version_string v)
+-end;;
++ | Sel_GEQ v -> Printf.sprintf " (>= %s)" (version_string v)
++ | Sel_GT v -> Printf.sprintf " (> %s)" (version_string v)
++;;
+
+ let check () =
+-let pkgs_to_check = ref (Package_set.diff (Functions.packages db)
!not_to_check) in
+ let result_ht = Hashtbl.create (Package_set.cardinal !pkgs_to_check) in
+ let progress =
+ if !quiet then Progress.dummy
+@@ -113,6 +174,7 @@ begin
+ end;;
+
+ let show_results ht =
++ (* returns true when all checks successful, otherwise false *)
+ begin
+ if !output_xml then print_endline "<results>";
+ Hashtbl.iter
+@@ -189,26 +251,82 @@ begin
+ end
+ ) ht;
+ if !output_xml then print_endline "</results>";
++ (* we return true when all checks have been successful, otherwise false
*)
++ Hashtbl.fold
++ (fun _ (result,_) accumulator -> result && accumulator)
++ ht
++ true
+ end;;
+
+-let speclist = [
++let speclist = ref [
+ ("-explain", Set explain_results, "Explain the results");
+ ("-failures", Clear show_successes, "Only show failures");
+ ("-successes", Clear show_failures, "Only show successes");
+- ("-base FILE", String (add_source false), "Additional binary package
control file providing packages that are not checked but used for resolving
dependencies");
++ ("-i", String (add_source true), "Additional input file providing
control stanzas of packages that are checked and used for resolving
dependencies");
++ ("-I", String (add_source false), "Additional input file providing
control stanzas of packages that are NOT checked but used only for resolving
dependencies");
++ ("-checkonly",
++ String (fun s -> units_to_check := Util.split_at ',' s;
units_to_check_set := true),
++ "Check only these packages");
+ ("-quiet", Set quiet, "Do not emit warnings nor progress/timing
information");
+ ("-xml", Set output_xml, "Output results in XML format");
+- ("-", Unit (fun () -> add_source true "-"), "");
+ ];;
+
+ let _ =
+ if Util.string_contains Sys.argv.(0) "debcheck" then
+ dist_type := `Debian
+ else if Util.string_contains Sys.argv.(0) "rpmcheck" then
+- dist_type := `RPM
++ begin
++ dist_type := `RPM;
++ speclist := ("-synthesis", Set rpm_synthesis, "Use synthesis
hdlist")::!speclist
++ end
+ else if Util.string_contains Sys.argv.(0) "pscheck" then
+ dist_type := `Pkgsrc
+ else (Printf.eprintf "Warning: unknown name '%s', behaving like
debcheck\n%!" Sys.argv.(0); dist_type := `Debian);
+- Arg.parse speclist (add_source true) "Distcheck v1.4.1";
+- if not !source_added then add_source true "-";
+- show_results (check ());;
++ Arg.parse !speclist (fun s -> checklist := s::!checklist) "Distcheck
$Revision$";
++ add_source true "-";
++ if !units_to_check_set
++ then
++ let rec separate_source_packages = function
++ [] -> [],[]
++ | h::r ->
++ let br,sr = separate_source_packages r
++ and h_length = String.length h
++ in if h_length >= 5 && String.sub h 0 4 = "src:"
++ then br,(String.sub h 4 (h_length-4))::sr
++ else h::br,sr
++ in let bin_units_to_check, src_units_to_check = separate_source_packages
!units_to_check
++ in let filtered_packages =
++ (Package_set.filter
++ (fun p -> List.mem (myunit_name_of p) bin_units_to_check || List.mem
(source_name_of p) src_units_to_check)
++ (Functions.packages db))
++ in let found_package_names =
++ List.map myunit_name_of (Package_set.elements filtered_packages)
++ in let missing_package_names =
++ List.filter
++ (fun pn -> not (List.mem pn found_package_names))
++ bin_units_to_check
++ in if missing_package_names <> []
++ then begin
++ packages_are_missing := true;
++ prerr_string "Warning: some packages not found:";
++ List.iter
++ (fun pn -> prerr_char ' '; prerr_string pn)
++ missing_package_names;
++ prerr_newline ();
++ flush stderr
++ end;
++ pkgs_to_check := filtered_packages
++ else begin
++ List.iter add_pkg_to_check !checklist;
++ if Package_set.is_empty !pkgs_to_check then
++ pkgs_to_check := Package_set.diff (Functions.packages db) !not_to_check;
++ end;
++ if !tmpfile <> "" then Sys.remove !tmpfile;
++ exit (if (show_results (check ()))
++ then
++ if !packages_are_missing
++ then 2 (* some packages that were asked to be checked are missing *)
++ else 0 (* all checks successful *)
++ else 1 (* some package are not installable *)
++);;
++
diff --git a/distcheck/Makefile b/distcheck/Makefile
index 90d25ae..442ec4c 100644
--- a/distcheck/Makefile
+++ b/distcheck/Makefile
@@ -4,7 +4,7 @@ SRCS= common.ml
OBJS= $(SRCS:.ml=.cmo)
XBJS= $(SRCS:.ml=.cmx)
-PACKAGES= dose2.packetology,dose2.rapids,str
+PACKAGES= dose2.packetology,dose2.rapids
OCAMLC= ocamlfind ocamlc -package $(PACKAGES)
OCAMLOPT= ocamlfind ocamlopt -package $(PACKAGES)
@@ -37,7 +37,7 @@ install: links
cp pscheck.opt $(BINDIR)
clean:
- rm -f distcheck distcheck.opt *.o *.cmo *.cmx *.cmi
+ rm -f distcheck distcheck.opt *.o *.cmo *.cmx
%.cmo: %.ml
$(OCAMLC) -o $@ -c $^
diff --git a/distcheck/common.ml b/distcheck/common.ml
index e42672e..07946ad 100644
--- a/distcheck/common.ml
+++ b/distcheck/common.ml
@@ -7,31 +7,20 @@ open Diagnosis
open Napkin
open Rapids
open Waterway
-open Str
let show_successes = ref true
and show_failures = ref true
and explain_results = ref false
and quiet = ref false
and output_xml= ref false
-and dist_type = ref `Debian;;
-let pkgs_to_check = ref Package_set.empty;;
-let units_to_check = ref [] (* units given by command line argument *)
-and units_to_check_set = ref false (* indicates whether units_to check set on
command line *)
-and packages_are_missing = ref false;; (* indicates that some packages that
were asked to be *)
- (* checked are not available. *)
-let checklist = ref [];;
-let rpm_synthesis = ref false;;
+and dist_type = ref `Debian
+and source_added = ref false;;
let db = create_database ();;
let architecture_index = get_architecture_index db;;
let unit_index = get_unit_index db;;
let package_index = get_package_index db;;
-let version_index = get_version_index db;;
-let release_index = get_release_index db;;
-let source_index = get_source_index db;;
let not_to_check = ref Package_set.empty;;
-let tmpfile = ref "";; (* temporary file for input *)
let add_source add_to_check s =
let merge x = if !quiet then
@@ -39,23 +28,21 @@ let merge x = if !quiet then
else
Waterway.merge db x in
begin
+ source_added := true;
(* This is not very effective, but hey... *)
let pkgs_old = Functions.packages db in
(let s2 = if s = "-" then
begin
- let (n, c) = Filename.open_temp_file "distcheck"
- (if !rpm_synthesis then "synthesis" else "")
- in
+ let (n, c) = Filename.open_temp_file "distcheck" "" in
begin
- tmpfile := n;
- try
- while true
- do
- Printf.fprintf c "%s\n" (read_line ())
- done
- with End_of_file -> close_out c;
- end;
- n
+ try
+ while true
+ do
+ Printf.fprintf c "%s\n" (read_line ())
+ done
+ with End_of_file -> close_out c
+ end;
+ n
end
else s in
match !dist_type with
@@ -67,31 +54,6 @@ begin
not_to_check := Package_set.union !not_to_check new_packages
end;;
-let add_pkg_to_check s =
-begin
- try
- let eq = String.index s '=' in
- let u = String.sub s 0 eq in
- let unit_id = Unit_index.search unit_index u in
- let v = String.sub s (eq+1) (String.length s-eq-1) in
- let (v_id, r_id) =
- try
- let dash = String.rindex v '-' in
- let rv = String.sub v 0 dash
- and r = String.sub v (dash+1) (String.length v-dash-1) in
- (Version_index.search version_index rv,
- Release_index.search release_index (Some r))
- with Not_found -> (Version_index.search version_index v,
- Release_index.search release_index None) in
- let ps = Functions.unit_id_to_package_set db unit_id in
- Package_set.iter (fun p_id ->
- let pkg = Functions.get_package_from_id db p_id in
- if pkg.pk_version = (v_id, r_id) then
- pkgs_to_check := Package_set.add p_id !pkgs_to_check
- ) ps;
- with Not_found -> ()
-end;;
-
let unit_name_of u_id =
Unit_index.find unit_index u_id;;
@@ -105,15 +67,6 @@ let pkg_name_of p_id =
| None -> ""
| Some rn -> "-" ^ rn);;
-let myunit_name_of p_id =
- let (_, pkg) = Package_index.find package_index p_id in
- Unit_index.find unit_index pkg.pk_unit
-
-(* gives the name of the source of a package *)
-let source_name_of p_id =
- let (_, pkg) = Package_index.find package_index p_id in
- fst (Source_index.find source_index pkg.pk_source)
-
let pkg_xml_of p_id =
let (_, pkg) = Package_index.find package_index p_id in
let unit_name = Unit_index.find unit_index pkg.pk_unit
@@ -126,37 +79,23 @@ let pkg_xml_of p_id =
| None -> ""
| Some rn -> "-" ^ rn);;
-(* xmlesc escapes some special caracters into XML *)
-let xmlesc s =
- global_replace (regexp_string ">") ">"
- (global_replace (regexp_string "<") "<" s)
-;;
-
let spec_string s =
- let version_string (v, r) =
- let vn = Version_index.get_version v
- and rn = Release_index.get_version r in
- vn ^ (match rn with None -> "" | Some r -> ("-"^r)) in
- if !output_xml
- then
- match s with
- | Sel_ANY -> ""
- | Sel_LT v -> Printf.sprintf " (< %s)" (xmlesc (version_string v))
- | Sel_LEQ v -> Printf.sprintf " (<= %s)" (xmlesc (version_string v))
- | Sel_EQ v -> Printf.sprintf " (= %s)" (xmlesc (version_string v))
- | Sel_GEQ v -> Printf.sprintf " (>= %s)" (xmlesc (version_string v))
- | Sel_GT v -> Printf.sprintf " (> %s)" (xmlesc (version_string v))
- else
- match s with
+let version_string (v, r) =
+ let vn = Version_index.get_version v
+ and rn = Release_index.get_version r in
+ vn ^ (match rn with None -> "" | Some r -> r) in
+begin
+ match s with
| Sel_ANY -> ""
- | Sel_LT v -> Printf.sprintf " (< %s)" (version_string v)
- | Sel_LEQ v -> Printf.sprintf " (<= %s)" (version_string v)
+ | Sel_LT v -> Printf.sprintf " (< %s)" (version_string v)
+ | Sel_LEQ v -> Printf.sprintf " (<= %s)" (version_string v)
| Sel_EQ v -> Printf.sprintf " (= %s)" (version_string v)
- | Sel_GEQ v -> Printf.sprintf " (>= %s)" (version_string v)
- | Sel_GT v -> Printf.sprintf " (> %s)" (version_string v)
-;;
+ | Sel_GEQ v -> Printf.sprintf " (>= %s)" (version_string v)
+ | Sel_GT v -> Printf.sprintf " (> %s)" (version_string v)
+end;;
let check () =
+let pkgs_to_check = ref (Package_set.diff (Functions.packages db)
!not_to_check) in
let result_ht = Hashtbl.create (Package_set.cardinal !pkgs_to_check) in
let progress =
if !quiet then Progress.dummy
@@ -174,7 +113,6 @@ begin
end;;
let show_results ht =
- (* returns true when all checks successful, otherwise false *)
begin
if !output_xml then print_endline "<results>";
Hashtbl.iter
@@ -251,82 +189,26 @@ begin
end
) ht;
if !output_xml then print_endline "</results>";
- (* we return true when all checks have been successful, otherwise false
*)
- Hashtbl.fold
- (fun _ (result,_) accumulator -> result && accumulator)
- ht
- true
end;;
-let speclist = ref [
+let speclist = [
("-explain", Set explain_results, "Explain the results");
("-failures", Clear show_successes, "Only show failures");
("-successes", Clear show_failures, "Only show successes");
- ("-i", String (add_source true), "Additional input file providing
control stanzas of packages that are checked and used for resolving
dependencies");
- ("-I", String (add_source false), "Additional input file providing
control stanzas of packages that are NOT checked but used only for resolving
dependencies");
- ("-checkonly",
- String (fun s -> units_to_check := Util.split_at ',' s;
units_to_check_set := true),
- "Check only these packages");
+ ("-base FILE", String (add_source false), "Additional binary package
control file providing packages that are not checked but used for resolving
dependencies");
("-quiet", Set quiet, "Do not emit warnings nor progress/timing
information");
("-xml", Set output_xml, "Output results in XML format");
+ ("-", Unit (fun () -> add_source true "-"), "");
];;
let _ =
if Util.string_contains Sys.argv.(0) "debcheck" then
dist_type := `Debian
else if Util.string_contains Sys.argv.(0) "rpmcheck" then
- begin
- dist_type := `RPM;
- speclist := ("-synthesis", Set rpm_synthesis, "Use synthesis
hdlist")::!speclist
- end
+ dist_type := `RPM
else if Util.string_contains Sys.argv.(0) "pscheck" then
dist_type := `Pkgsrc
else (Printf.eprintf "Warning: unknown name '%s', behaving like
debcheck\n%!" Sys.argv.(0); dist_type := `Debian);
- Arg.parse !speclist (fun s -> checklist := s::!checklist) "Distcheck
$Revision$";
- add_source true "-";
- if !units_to_check_set
- then
- let rec separate_source_packages = function
- [] -> [],[]
- | h::r ->
- let br,sr = separate_source_packages r
- and h_length = String.length h
- in if h_length >= 5 && String.sub h 0 4 = "src:"
- then br,(String.sub h 4 (h_length-4))::sr
- else h::br,sr
- in let bin_units_to_check, src_units_to_check = separate_source_packages
!units_to_check
- in let filtered_packages =
- (Package_set.filter
- (fun p -> List.mem (myunit_name_of p) bin_units_to_check || List.mem
(source_name_of p) src_units_to_check)
- (Functions.packages db))
- in let found_package_names =
- List.map myunit_name_of (Package_set.elements filtered_packages)
- in let missing_package_names =
- List.filter
- (fun pn -> not (List.mem pn found_package_names))
- bin_units_to_check
- in if missing_package_names <> []
- then begin
- packages_are_missing := true;
- prerr_string "Warning: some packages not found:";
- List.iter
- (fun pn -> prerr_char ' '; prerr_string pn)
- missing_package_names;
- prerr_newline ();
- flush stderr
- end;
- pkgs_to_check := filtered_packages
- else begin
- List.iter add_pkg_to_check !checklist;
- if Package_set.is_empty !pkgs_to_check then
- pkgs_to_check := Package_set.diff (Functions.packages db) !not_to_check;
- end;
- if !tmpfile <> "" then Sys.remove !tmpfile;
- exit (if (show_results (check ()))
- then
- if !packages_are_missing
- then 2 (* some packages that were asked to be checked are missing *)
- else 0 (* all checks successful *)
- else 1 (* some package are not installable *)
-);;
-
+ Arg.parse speclist (add_source true) "Distcheck v1.4.1";
+ if not !source_added then add_source true "-";
+ show_results (check ());;
diff --git a/doc/pkglab.tex b/doc/pkglab.tex
index 1c4f74d..8da2705 100644
--- a/doc/pkglab.tex
+++ b/doc/pkglab.tex
@@ -83,10 +83,10 @@ Pkglab knows several different types of objects:
sets; used to track the contents of a distribution through times
\item[Dates] (denoted: {\tt YYYY-MM-DD})
\item[Date ranges] (denoted: {\tt [YYYY-MM-DD;YYYY-MM-DD]})
- \item[Specifications] (denoted: {\tt [. kde (>= '5.2) .]}) A selector
+ \item[Specifications] (denoted: {\tt [. kde (>= 5.2) .]}) A selector
on the versions of a unit, in this case all versions of the unit {\tt kde}
greater than or equal to {\tt 5.2}. The version is optional;
- {\tt [. kde .]} is a valid specification as well. The spaces between the
{\tt [.} brackets and the specification are necessary!
+ {\tt [. kde .]} is a valid specification as well.
\item[Sets] (denoted: {\tt \{a, b, \ldots\}})
\item[Diagnoses] The result of a check operation: a list of packages that
are not installable with their reasons.
@@ -98,7 +98,7 @@ It is possible to use variables: like in Unix shells,
variable names are
prefixed by a dollar sign ({\tt \$}). Assignment is done as follows:
\codebox{
-> \$a <- select([. kde (>= '5.2) .])
+> \$a <- select([. kde (>= 5.2) .])
}
Pkglab has the following operators:
diff --git a/dql/help.ml b/dql/help.ml
index 5c66ccb..38b1865 100644
--- a/dql/help.ml
+++ b/dql/help.ml
@@ -62,7 +62,7 @@ let help_string =
Simple " $"; Red "name"; Tab; Tab; Tab; Tab; Simple
"Variable"; Newline;
Simple " "; Red "yyyy"; Simple "-"; Red "mm"; Simple "-"; Red
"dd"; Tab; Tab; Tab; Simple "Date"; Newline;
Simple " ["; Red "date1"; Simple ";"; Red "date2"; Simple "]";
Tab; Tab; Tab; Simple "Date range"; Newline;
- Simple " [."; Red "unit"; Simple "("; Red "operator version";
Simple ").]"; Tab; Simple "Version specification (e.g. [. kde (>= '5.2) .])";
Newline;
+ Simple " [."; Red "unit"; Simple "("; Red "operator version";
Simple ").]"; Tab; Simple "Version specification (e.g. [.kde (>= 5.2).])";
Newline;
Tab; Tab; Tab; Tab; Simple "(version part is optional)";
Newline;
Simple " {"; Red "e1"; Simple ","; Red "e2"; Simple ","; Red
"..."; Simple ","; Red "en"; Simple "}"; Tab; Tab; Simple "Set construction";
Newline;
Simple " "; Red "set1"; Simple "|"; Red "set2"; Simple " ";
Red "set1"; Simple "&"; Red "set2"; Simple " "; Red "set1"; Simple "\\"; Red
"set2"; Tab; Simple "Set union/intersection/difference"; Newline;
--
pkglab packaging
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
