This is an automated email from the git hooks/post-receive script.
mehdi pushed a commit to branch master
in repository coinst.
commit 5517e47a4ec4494bc46c8fad3cf2d103d06f14fd
Author: Mehdi Dogguy <me...@debian.org>
Date: Sat Feb 13 14:41:16 2016 +0100
Imported Upstream version 1.9.3
---
CHANGES | 6 ++++++
Makefile | 2 +-
rpm_lib.ml | 10 +++++-----
transition.ml | 24 +++++++++++++-----------
util.ml | 4 ----
util.mli | 2 --
viewer/Makefile | 2 +-
7 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/CHANGES b/CHANGES
index bed28f3..a836d12 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+===== 1.9.3 (2016-02-13) =====
+
+* Show single-package hints when asked to (using --all-hints)
+* Fix buffering bug when printing hints
+* Fix space/tab issue in Makefile
+
===== 1.9.2 (2016-01-24) =====
* Add build targets for bytecode binaries
diff --git a/Makefile b/Makefile
index 869569f..9bfe621 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=1.9.2
+VERSION=1.9.3
COINST=coinst
UPGRADE=coinst-upgrades
TRANS=comigrate
diff --git a/rpm_lib.ml b/rpm_lib.ml
index 58c9744..a14ddd6 100644
--- a/rpm_lib.ml
+++ b/rpm_lib.ml
@@ -319,14 +319,14 @@ exception Skip
let check_entry tag typ tag' typ' =
if tag <> tag' then begin
let b = Buffer.create 80 in
- Util.bprintf b "Expected tag %a but actual tag is %a@?"
+ Format.bprintf b "Expected tag %a but actual tag is %a@?"
pr_tag tag pr_tag tag';
Util.print_warning (Buffer.contents b);
raise Skip
end;
if typ <> typ' then begin
let b = Buffer.create 80 in
- Util.bprintf b "Entry %a has expected type %a but actual typ is %a@?"
+ Format.bprintf b "Entry %a has expected type %a but actual typ is %a@?"
pr_tag tag pr_typ typ pr_typ typ';
Util.fail (Buffer.contents b)
end
@@ -336,7 +336,7 @@ let estring store entry i tag =
check_entry tag STRING tag' typ;
if count <> 1 then begin
let b = Buffer.create 80 in
- Util.bprintf b "Entry %a has type STRING with count %d > 1@?"
+ Format.bprintf b "Entry %a has type STRING with count %d > 1@?"
pr_tag tag count;
Util.fail (Buffer.contents b)
end;
@@ -352,7 +352,7 @@ let eint32 store entry i tag =
check_entry tag INT32 tag' typ;
if count <> 1 then begin
let b = Buffer.create 80 in
- Util.bprintf b "Expecting a single INT32 for entry %a but got %d@?"
+ Format.bprintf b "Expecting a single INT32 for entry %a but got %d@?"
pr_tag tag count;
Util.fail (Buffer.contents b)
end;
@@ -536,7 +536,7 @@ let parse_version s =
match release with Some r -> check_version r | _ -> false
then begin
let b = Buffer.create 80 in
- Util.bprintf b
+ Format.bprintf b
"version '%a' not ending with an alphanumeric character@?"
pr_version (epoch, version, release, distepoch);
Util.print_warning (Buffer.contents b)
diff --git a/transition.ml b/transition.ml
index 3240d88..ef23097 100644
--- a/transition.ml
+++ b/transition.ml
@@ -2464,7 +2464,7 @@ let collect_changes st (unchanged, subset, src_unchanged)
=
let src =
if smooth_update then begin
let b = Buffer.create 20 in
- Util.bprintf b "-%s/%s/%a"
+ Format.bprintf b "-%s/%s/%a%!"
(M.name_of_id nm) st.arch M.print_version v;
Buffer.contents b
end else
@@ -2546,7 +2546,7 @@ let generate_hints ?formatter
if should_show then begin
let (su, gen) =
List.partition (fun (src, arch) -> is_smooth_update src) l in
- if List.length gen > 1 then begin
+ if List.length gen > 1 || !all_hints then begin
Format.fprintf f "easy";
List.iter (fun (src, arch) -> print_pkg f src arch) gen;
Format.fprintf f "@.";
@@ -2592,7 +2592,7 @@ let heidi_line lines nm vers arch sect =
Buffer.add_string heidi_buffer sect;
Buffer.add_char heidi_buffer '\n';
(*
- Util.bprintf heidi_buffer "%s %a %s %s@."
+ Format.bprintf heidi_buffer "%s %a %s %s@."
nm M.print_version vers arch sect;
*)
lines := Buffer.contents heidi_buffer :: !lines;
@@ -2750,29 +2750,30 @@ let analyze_migration
!lst;
let lst =
let b = Buffer.create 80 in
+ let to_b = Format.formatter_of_buffer b in
List.map
(fun (p, reason) ->
Buffer.clear b;
begin match reason with
Not_yet_built (nm, _, _, outdated) ->
if outdated then
- Util.bprintf b "# remove outdated binary package %a"
+ Format.fprintf to_b "# remove outdated binary package %a"
print_package p
else
- Util.bprintf b "# remove obsolete binary package %a"
+ Format.fprintf to_b "# remove obsolete binary package %a"
print_package p
| Blocked (kind, _) ->
let (src, _) = get_name_arch p in
let vers =
(M.find_source_by_name u (M.id_of_name src)).M.s_version
in
- Util.bprintf b "un%s %s/%a" kind src M.print_version vers
+ Format.fprintf to_b "un%s %s/%a" kind src M.print_version vers
| Too_young (cur_ag, _) ->
let (src, _) = get_name_arch p in
let vers =
(M.find_source_by_name u (M.id_of_name src)).M.s_version
in
- Util.bprintf b "age-days %d %s/%a"
+ Format.fprintf to_b "age-days %d %s/%a"
cur_ag src M.print_version vers
| More_bugs s ->
let print_bugs =
@@ -2783,13 +2784,13 @@ let analyze_migration
let vers =
(M.find_source_by_name u (M.id_of_name nm)).M.s_version
in
- Util.bprintf b "# source package %s/%a: fix "
+ Format.fprintf to_b "# source package %s/%a: fix "
nm M.print_version vers;
if StringSet.cardinal s = 1 then
- Util.bprintf b "bug %a"
+ Format.fprintf to_b "bug %a"
print_bugs (StringSet.elements s)
else
- Util.bprintf b "bugs %a"
+ Format.fprintf to_b "bugs %a"
print_bugs (StringSet.elements s)
end else begin
let s =
@@ -2800,7 +2801,7 @@ let analyze_migration
s
in
if not (StringSet.is_empty s) then begin
- Util.bprintf b "# binary package %s: fix bugs %a"
+ Format.fprintf to_b "# binary package %s: fix bugs %a"
nm print_bugs (StringSet.elements s)
end
end
@@ -2808,6 +2809,7 @@ let analyze_migration
| Binary_not_added | Binary_not_removed | Unchanged ->
assert false
end;
+ Format.pp_print_flush to_b ();
Buffer.contents b)
(List.rev !lst)
in
diff --git a/util.ml b/util.ml
index d25ef3f..d6df95d 100644
--- a/util.ml
+++ b/util.ml
@@ -325,7 +325,3 @@ let date () =
Format.sprintf "%s, %d %s %d %02d:%02d:%02d UTC"
days.(t.Unix.tm_wday - 1) t.Unix.tm_mday months.(t.Unix.tm_mon)
(t.Unix.tm_year + 1900) t.Unix.tm_hour t.Unix.tm_min t.Unix.tm_sec
-
-let bprintf b f x =
- let to_b = Format.formatter_of_buffer b in
- Format.fprintf to_b f x
diff --git a/util.mli b/util.mli
index f6fb24b..ad0bb9c 100644
--- a/util.mli
+++ b/util.mli
@@ -102,5 +102,3 @@ end
val trim : string -> string
val date : unit -> string
-
-val bprintf : Buffer.t -> ('a -> 'b, Format.formatter, unit) format -> 'a -> 'b
diff --git a/viewer/Makefile b/viewer/Makefile
index b6915e8..5153664 100644
--- a/viewer/Makefile
+++ b/viewer/Makefile
@@ -28,7 +28,7 @@ coinst_viewer: $(OBJS)
$(OCAMLOPT) -o $@ $(OPTLINKFLAGS) $^
coinst_viewer.byte: $(OBJS:.cmx=.cmo)
- $(OCAMLC) -o $@ $(OPTLINKFLAGS) $^
+ $(OCAMLC) -o $@ $(OPTLINKFLAGS) $^
coinst_converter: $(CONVERTER)
$(OCAMLOPT) -o $@ $(OPTLINKFLAGS) $^
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/coinst.git
_______________________________________________
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
