From 520be2fdc247ad18036ca5db53f027d8920d8648 Mon Sep 17 00:00:00 2001
From: Jon Ludlam <jonathan.ludlam@citrix.com>
Date: Tue, 1 Dec 2015 16:05:01 +0000
Subject: [PATCH] Update to newer core release

Signed-off-by: Jon Ludlam <jonathan.ludlam@citrix.com>
---
 .travis.yml | 2 +-
 main.ml     | 4 ++--
 opam        | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f737074..59f7d88 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,4 +3,4 @@ install: wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/ma
 script: bash -ex .travis-opam.sh
 sudo: true
 env:
-        - OCAML_VERSION=4.01 PACKAGE=xapi-storage-script PINS="xapi-storage:git://github.com/djs55/xapi-storage" EXTRA_REMOTES="git://github.com/xapi-project/opam-repo-dev"
+        - OCAML_VERSION=4.02 PACKAGE=xapi-storage-script PINS="xapi-storage:git://github.com/djs55/xapi-storage" EXTRA_REMOTES="git://github.com/xapi-project/opam-repo-dev"
diff --git a/main.ml b/main.ml
index 6bdf67a..f3715af 100644
--- a/main.ml
+++ b/main.ml
@@ -114,7 +114,7 @@ let fork_exec_rpc root_dir script_name args response_of_rpc =
     Writer.write w (Jsonrpc.to_string args);
     Writer.close w
     >>= fun () ->
-    Process.wait p
+    Process.collect_output_and_wait p
     >>= fun output ->
     begin match output.Process.Output.exit_status with
     | Error (`Exit_non_zero code) ->
@@ -1084,7 +1084,7 @@ let _ =
     () with
   | `Ok () -> ()
   | `Error x ->
-    Printf.fprintf stderr "Error: %s\n%!" x;
+    error "Error: %s\n%!" x;
     Pervasives.exit 1);
 
   if !Xcp_service.daemon then begin
diff --git a/opam b/opam
index 374d045..8ac860d 100644
--- a/opam
+++ b/opam
@@ -10,8 +10,9 @@ remove: [
 depends: [
   "xapi-idl" {>= "0.10.0" }
   "xapi-storage"
-  "async" {= "111.25.00" }
-  "async_inotify" {= "111.28.00" }
+  "async"
+  "async_inotify"
+  "async_unix" {>= "112.24.00" }
   "core"
   "message-switch" {>= "0.11.0" }
 ]