[Pkg-ocaml-maint-commits] [SCM] OCaml transition monitor branch, master, updated. 951a2281379b7be5f5d77cbdfcb6e3806844b036

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 7fff5a3349b529743ac80061c324137cf00c3520
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Jul 1 19:37:32 2009 +0000

    Take into account contrib and non-free

diff --git a/ocaml_transition_monitor.mll b/ocaml_transition_monitor.mll
index 0538164..d1cebd8 100644
--- a/ocaml_transition_monitor.mll
+++ b/ocaml_transition_monitor.mll
@@ -14,7 +14,7 @@
 
   let mirror = "http://ftp.debian.org/debian"
   let suite = "unstable"
-  let section = "main"
+  let sections = ["main"; "contrib"; "non-free"]
 
   let dom_mail = "Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>"
 
@@ -287,15 +287,27 @@ and skip = parse
   let get_package_lists () =
     List.for_all
       (fun arch ->
-         let url = sprintf "%s/dists/%s/%s/binary-%s/Packages.bz2" mirror suite section arch in
-         let cmd = sprintf "wget -q -O- '%s' | bzcat > Packages.new && mv Packages.new Packages.%s" url arch in
+         let commands = List.map
+           (fun section ->
+              let url = sprintf "%s/dists/%s/%s/binary-%s/Packages.bz2" mirror suite section arch in
+              let cmd = sprintf "{ wget -q -O- '%s' | bzcat >> Packages.new; }" url in
+              cmd)
+           sections
+         in
+         let cmd = "rm -f Packages.new && " ^ (String.concat " && " commands) ^ " && mv Packages.new Packages." ^ arch in
          progress "Downloading Packages.%s...%!" arch;
          let r = Sys.command cmd in
          progress "\n%!";
          r = 0)
       architectures
-    && (let url = sprintf "%s/dists/%s/%s/source/Sources.bz2" mirror suite section in
-        let cmd = sprintf "wget -q -O- '%s' | bzcat > Packages.new && mv Packages.new Packages.source" url in
+    && (let commands = List.map
+          (fun section ->
+             let url = sprintf "%s/dists/%s/%s/source/Sources.bz2" mirror suite section in
+             let cmd = sprintf "{ wget -q -O- '%s' | bzcat >> Packages.new; }" url in
+             cmd)
+          sections
+        in
+        let cmd = "rm -f Packages.new && " ^ (String.concat " && " commands) ^ " && mv Packages.new Packages.source" in
         progress "Downloading Packages.source...%!";
         let r = Sys.command cmd in
         progress "\n%!";

-- 
OCaml transition monitor