[Pkg-ocaml-maint-commits] r6298 - /trunk/tools/ocaml_transition_monitor/ocaml_transition_monitor.mll

[glondu-guest at users.alioth.debian.org]

Author: glondu-guest
Date: Sun Mar  1 20:44:33 2009
New Revision: 6298

URL: http://svn.debian.org/wsvn/?sc=1&rev=6298
Log:
New binNMU request format

Modified:
    trunk/tools/ocaml_transition_monitor/ocaml_transition_monitor.mll

Modified: trunk/tools/ocaml_transition_monitor/ocaml_transition_monitor.mll
URL: http://svn.debian.org/wsvn/trunk/tools/ocaml_transition_monitor/ocaml_transition_monitor.mll?rev=6298&op=diff
==============================================================================
--- trunk/tools/ocaml_transition_monitor/ocaml_transition_monitor.mll (original)
+++ trunk/tools/ocaml_transition_monitor/ocaml_transition_monitor.mll Sun Mar  1 20:44:33 2009
@@ -23,6 +23,7 @@
 
   let architectures =
     [ "alpha"; "amd64"; "armel"; "hppa"; "i386"; "ia64"; "mips"; "mipsel"; "powerpc"; "s390"; "sparc" ]
+  let all_architectures = String.concat " " architectures
 
   module S = Set.Make(String)
   module M = Map.Make(String)
@@ -513,22 +514,25 @@
               (List.filter (fun (_, status) -> status = Outdated)
                  (List.combine architectures (M.find pkg sources_status)))
           in
+          let archs = String.concat " " bad_architectures in
+          let archs = if archs = all_architectures then "ALL" else archs in
           let src = M.find pkg sources in
           let dep_waits = List.fold_left
             (fun accu dep ->
                try
-                 (sprintf "%s dep-wait %s (>= %s)\n" pkg dep (M.find dep next_version_map))::accu
+                 (sprintf "%s (>= %s)" dep (M.find dep next_version_map))::accu
                with
                  | Not_found -> accu)
             [] src.sdeps
           in
-          fprintf chan "%s_%s, %s, %d, %s\n"
+          let dep_waits = sprintf "dw %s_%s . %s . -m '%s'" pkg src.sversion archs (String.concat ", " dep_waits) in
+          fprintf chan "nmu %d %s_%s . %s . -m '%s'\n%s\n"
+            (M.find pkg summary_binNMU)
             pkg
             src.sversion
+            archs
             reason
-            (M.find pkg summary_binNMU)
-            (String.concat " " bad_architectures);
-          List.iter (output_string chan) dep_waits
+            dep_waits
         in
         let format_section n section =
           let section = List.filter (fun x -> M.find x summary_status = Outdated) section in