Merge branch 'master' of https://github.com/OCamlPro/opam

Conflicts:
	src/opamGlobals.ml.in

jenkins/10-opam-prepare.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+apt-get -y install ocaml libssl-dev ocaml-compiler-libs

jenkins/20-opam-init.sh

@@ -0,0 +1,5 @@
+#!/bin/sh -e
+rm -rf .opam
+./configure --prefix=$HOME/opam-bin
+make
+make install

jenkins/30-opam-packages.sh

@@ -0,0 +1,12 @@
+#!/bin/sh -ex
+OPAM=$HOME/opam-bin/bin/opam
+ROOT=`echo /b/${JOB_NAME} | sed -e s,=,_,g`
+rm -rf ${ROOT}
+$OPAM --yes --root $ROOT init .
+if [ "${compiler}" != "system" ]; then
+  $OPAM --yes --root $ROOT switch ${compiler}
+fi
+if [ "${packages}" = "all" ]; then
+  packages=`$OPAM --root $ROOT list -short`
+fi
+$OPAM --yes --root $ROOT install ${packages}

jenkins/31-opam-mirage-packages.sh

@@ -0,0 +1,13 @@
+#!/bin/sh -ex
+OPAM=$HOME/opam-bin/bin/opam
+ROOT=`echo /b/${JOB_NAME} | sed -e s,=,_,g`
+rm -rf ${ROOT}
+$OPAM --yes --root $ROOT init .
+$OPAM --yes --root $ROOT remote -add dev git://github.com/mirage/opam-repo-dev
+if [ "${compiler}" != "system" ]; then
+  $OPAM --yes --root $ROOT switch ${compiler}
+fi
+if [ "${packages}" = "all" ]; then
+  packages=`$OPAM --root $ROOT list -short`
+fi
+$OPAM --yes --root $ROOT install ${packages}

src/opamClient.ml

@@ -2038,11 +2038,7 @@ let upgrade names =
 let check_opam_version () =
   let t = load_state () in
   let n = OpamPackage.Name.of_string "opam" in
-  let current_version =
-    let v = match OpamSystem.read_command_output ["opam"; "--version"] with
-      | s::_ -> List.hd (List.rev (OpamMisc.split s ' '))
-      | _    -> assert false in
-   OpamPackage.Version.of_string v in
+  let current_version = OpamPackage.Version.of_string OpamGlobals.version in
   match find_package_by_name t n with
   | None   -> ()
   | Some _ ->