Merge pull request #3805 from rjbou/2.0.4

2.0.4 backported commits

.travis-ci.sh

@@ -29,7 +29,7 @@ init-bootstrap () {
     eval $(opam env)
     # extlib is installed, since UChar.cmi causes problems with the search
     # order. See also the removal of uChar and uTF8 in src_ext/jbuild-extlib-src
-    opam install cohttp-lwt-unix ssl cmdliner dose3 cudf.0.9 opam-file-format re extlib dune 'mccs>=1.1+5' --yes
+    opam install ssl cmdliner dose3 cudf.0.9 opam-file-format re extlib dune 'mccs>=1.1+5' --yes
   fi
   rm -f "$OPAMBSROOT"/log/*
 }
@@ -102,7 +102,10 @@ EOF
         tar -xzf ocaml-$OCAML_VERSION.tar.gz
         cd ocaml-$OCAML_VERSION
         if [[ $OPAM_TEST -ne 1 ]] ; then
-          CONFIGURE_SWITCHES="-no-ocamldoc -no-ocamlbuild"
+          CONFIGURE_SWITCHES="-no-ocamldoc"
+          if [[ "$OCAML_VERSION" != "4.02.3" ]] ; then
+            CONFIGURE_SWITCHES="$CONFIGURE_SWITCHES -no-ocamlbuild"
+          fi
         fi
         ./configure --prefix ~/local -no-graph -no-debugger ${CONFIGURE_SWITCHES:-}
         if [[ $OPAM_TEST -eq 1 ]] ; then
@@ -156,6 +159,7 @@ export OCAMLRUNPARAM=b
     make lib-ext
   fi
   make all
+  make man
 
   rm -f ~/local/bin/opam
   make install
@@ -167,10 +171,10 @@ export OCAMLRUNPARAM=b
     done
     # Compile and run opam-rt
     cd ~/build
-    wget https://github.com/ocaml/opam-rt/archive/$TRAVIS_PULL_REQUEST_BRANCH.tar.gz -O opam-rt.tar.gz || \
-    wget https://github.com/ocaml/opam-rt/archive/master.tar.gz -O opam-rt.tar.gz
+    wget https://github.com/ocaml/opam-rt/archive/opam2.0.tar.gz -O opam-rt.tar.gz
     tar -xzf opam-rt.tar.gz
     cd opam-rt-*
+    opam install ./opam-rt.opam --deps-only -y
     make
 
     opam switch default

CHANGES

@@ -2,6 +2,24 @@ Changes prefixed with "(*)" are potentially breaking to scripts or existing
 repositories (changes that are automatically handled by the format upgrade tools
 are not marked).
 
+2.0.4:
+* Add (rudimentary) error handling to `make man`
+* Sandboxing on MacOS: considering the possibility that TMPDIR in unset
+* display: Fix opam var display
+* pin:
+  * update source of (version) pinned directory
+  * fix `--ignore-pin-depends` with autopin
+  * fix pinnings not installing/upgrading already pinned packages (introduced in 2.0.2)
+* opam clean: Ignore errors trying to remove directories
+* remove wrong mismatching extra-files warning
+* urls: fix hg opam 1.2 url parsing
+* lint: warning error 47 on descr first line
+* dirtrack: fix precise tracking mode
+* system:
+  * lock & signals: don't interrupt at non terminal signals
+  * shell: fix fish manpath setting
+  * git: use git -c diff.noprefix=false diff in case it is defined in user config
+
 2.0.3:
 * Fix manpage remaining $ (OPAMBESTEFFORT)
 * Fix OPAMROOTISOK handling
@@ -552,12 +570,12 @@ are not marked).
 * Improve the syntax of filters
 * Add a `messages` field
 * Add a `--jobs` command line option and add `%{jobs}%` to be used in OPAM files
-* Various improvments in the solver heuristics
+* Various improvements in the solver heuristics
 * By default, turn-on checking of certificates for downloaded dependency archives: use `./configure --disable-certificate-check` to go back to the previous behavior
 * Check the md5sum of downloaded archives when compiling OPAM
 * Improved `opam info` command (more information, non-zero error code when no patterns match)
 * Display OS and OPAM version on internal errors to ease error reporting
-* Fix `opam reinstall` when reinstalling a package wich is a dependency of installed packages (regression introduced in 0.9.5)
+* Fix `opam reinstall` when reinstalling a package which is a dependency of installed packages (regression introduced in 0.9.5)
 * Export and read `OPAMSWITCH` to be able to call OPAM in different switches
 * `opam-client` can now be used in a toplevel
 * `-n` now means `--no-setup` and not `--no-checksums` anymore
@@ -700,7 +718,7 @@ are not marked).
 * improve opam-mk-repo
 * fix `opam search` to be caseless
 * ability to filter some commands (depending on some predicates) in opam file
-* improvments when packages disapear upstream
+* improvements when packages disappear upstream
 * check for ocaml 3.12.1 on configure
 * tell the user to unset some potentially dangerous variables when running opam
 * fix few git backend issues

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for opam 2.0.3.
+# Generated by GNU Autoconf 2.69 for opam 2.0.4.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -578,8 +578,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='opam'
 PACKAGE_TARNAME='opam'
-PACKAGE_VERSION='2.0.3'
-PACKAGE_STRING='opam 2.0.3'
+PACKAGE_VERSION='2.0.4'
+PACKAGE_STRING='opam 2.0.4'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1264,7 +1264,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures opam 2.0.3 to adapt to many kinds of systems.
+\`configure' configures opam 2.0.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1326,7 +1326,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of opam 2.0.3:";;
+     short | recursive ) echo "Configuration of opam 2.0.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1429,7 +1429,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-opam configure 2.0.3
+opam configure 2.0.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1524,7 +1524,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by opam $as_me 2.0.3, which was
+It was created by opam $as_me 2.0.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -6001,7 +6001,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by opam $as_me 2.0.3, which was
+This file was extended by opam $as_me 2.0.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6054,7 +6054,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-opam config.status 2.0.3
+opam config.status 2.0.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,5 +1,5 @@
 dnl The line below must be formatted AC_INIT(opam,VERSION) with no extra spaces
-AC_INIT(opam,2.0.3)
+AC_INIT(opam,2.0.4)
 AC_COPYRIGHT(Copyright 2012-2017 OcamlPro SAS)
 
 AC_CONFIG_MACRO_DIR([m4])

doc/Makefile

@@ -33,15 +33,17 @@ all: man html pages
 man:
 	rm -rf man
 	mkdir -p man
-	$(OPAM) $(HELPFMT) > man/opam.1
+	$(OPAM) $(HELPFMT) > man/opam.1 2> man/err
 	for i in $(TOPICS); do\
-	  $(OPAM) $$i $(HELPFMT) > man/opam-$$i.1;\
+	  $(OPAM) $$i $(HELPFMT) > man/opam-$$i.1 2>> man/err ; \
 	done
-	$(OPAM) admin $(HELPFMT) > man/opam-admin.1
+	$(OPAM) admin $(HELPFMT) > man/opam-admin.1 2>> man/err
 	for i in $(TOPICS_ADMIN); do\
-	  $(OPAM) admin $$i $(HELPFMT) > man/opam-admin-$$i.1;\
+	  $(OPAM) admin $$i $(HELPFMT) > man/opam-admin-$$i.1 2>> man/err ; \
 	done
-	$(OPAM_INSTALLER) $(HELPFMT) > man/opam-installer.1
+	$(OPAM_INSTALLER) $(HELPFMT) > man/opam-installer.1 2>> man/err
+# Dune doesn't (yet) support --no-print-directory
+	@if grep -v "^Entering directory '" man/err > man/err2 ; then cat man/err2 ; false ; fi
 
 man-html: man
 	rm -rf man-html

doc/design/depexts-plugins

@@ -67,7 +67,7 @@ cases outlined above:
    or an explanation for the failure, while perform executes the actions (typically
    after user confirmation)
 
-The proposed module interface is purposedly incomplete, as it makes no assumption
+The proposed module interface is intentionally incomplete, as it makes no assumption
 on the way in which plugins are identified, and registered, which is an orthogonal
 issue.
 

doc/design/depopts-and-features

@@ -75,7 +75,7 @@ but presented in order of increased implementation complexity
         package is scheduled.
 
         The depopts: field is not used at all by the package dependencies
-        resolution phase, and must not be transalted into CUDF.
+        resolution phase, and must not be translated into CUDF.
 
         After the solver returns a solution, packages in this list that are
         present in the system are added with all their dependencies to the

doc/design/provides.md

@@ -35,7 +35,7 @@ versions.
 
 The feature provided can already be encoded without an extra field: given a list
 of packages that `provide` a given name, a package by this name can be added
-with a dependency towards either of those. However, on a repository maintainance
+with a dependency towards either of those. However, on a repository maintenance
 point of view, having to list all the alternatives adds much more burden.
 
 Besides, it's not possible, using pinning or an additional repository, to

doc/pages/External_solvers.md

@@ -61,7 +61,7 @@ For example, the preference `-removed` tells the solver that among all possible
 These combinators can be combined in a comma separated sequence, that is treated in lexicographic order by the solver.
 
 ### Default preferences for an upgrade
-For example, the preference `-removed,-notuptodate,-changed` tells the solver that after ensuring that removals are minimised, it should look for a solution that minimises also the number of packages wich are not at their latest version, and then reduce the changes to a minimum.
+For example, the preference `-removed,-notuptodate,-changed` tells the solver that after ensuring that removals are minimised, it should look for a solution that minimises also the number of packages which are not at their latest version, and then reduce the changes to a minimum.
 
 This is close to the default preference setting used by `opam` when you perform an update or an upgrade, and in practice it tries to bring _all_ your packages to the latest version available, as far as this does not implies removing too many packages. It can be set using the environment variable `OPAMUPGRADECRITERIA`, or the [`solver-upgrade-criteria:`](Manual.html#configfield-solver-upgrade-criteria) configuration field.
 
@@ -71,7 +71,7 @@ When you request to install a (set of) package(s), in general you do not expect
 ### Specifying preferences for opam
 
 `opam` allows to specify your criteria on the command line, using the `--criteria` option, that will apply only to the current command.
-For example if you are a very conservative user, you might try issueing the following command:
+For example, if you are a very conservative user, you might try issuing the following command:
 ```
 opam install --criteria="-removed,-changed" ...
 ```

doc/pages/Specifying_Solver_Preferences.md

@@ -25,7 +25,7 @@ For example, the preference  `-removed`  tells the solver that among all possibl
 These combinators can be combined in a comma separated sequence, that is treated in lexicographic order by the solver.
 
 ### Default preferences for an upgrade
-For example, the preference  `-removed,-notuptodate,-changed`  tells the solver that after ensuring that removals are minimised, it should look for a solution that minimises also the number of packages wich are not at their latest version, and then reduce the changes to a minimum.
+For example, the preference  `-removed,-notuptodate,-changed`  tells the solver that after ensuring that removals are minimised, it should look for a solution that minimises also the number of packages which are not at their latest version, and then reduce the changes to a minimum.
 
 This is the default preference setting used by `opam` when you perform an update or an upgrade, and in practice it tries to bring _all_ your packages to the latest version available, as far as this does not implies removing too many packages. It can be set using the environment variable `OPAMUPGRADECRITERIA`
 
@@ -35,7 +35,7 @@ When you request to install a (set of) package(s), in general you do not expect
 ### Specifying preferences for opam
 
 Recent versions of `opam` allow to specify your criteria on the command line, using the `--criteria` option, that will apply only to the current command.
-For example if you are a very conservative user, you might try issueing the following command:
+For example, if you are a very conservative user, you might try issuing the following command:
 ```
 opam install --criteria="-removed,-changed" ...
 ```

doc/pages/Tricks.md

@@ -103,7 +103,7 @@ to:
   is to use the `conflict-class:` field: add _e.g._ `conflict-class:
   "foo-implementation"` to all versions of both `a` and `b`.
 
-The need to define the virtual package explicitely also ensures that a third
+The need to define the virtual package explicitly also ensures that a third
 package can't inject a new implementation without that being visible in `foo`:
 it would otherwise be a security hole when we deploy end-to-end signing of
 packages.

opam-client.opam

@@ -1,5 +1,5 @@
 opam-version: "1.2"
-version: "2.0.3"
+version: "2.0.4"
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [
   "Vincent Bernardoff <vb@luminar.eu.org>"
@@ -21,8 +21,8 @@ build: [
   [make "%{name}%.install"]
 ]
 depends: [
-  "opam-state" {= "2.0.3"}
-  "opam-solver" {= "2.0.3"}
+  "opam-state" {= "2.0.4"}
+  "opam-solver" {= "2.0.4"}
   "re" {>= "1.7.2"}
   "cmdliner" {>= "0.9.8"}
   "dune" {build & >= "1.2.1"}

opam-core.opam

@@ -1,5 +1,5 @@
 opam-version: "1.2"
-version: "2.0.3"
+version: "2.0.4"
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [
   "Vincent Bernardoff <vb@luminar.eu.org>"

opam-devel.opam

@@ -1,5 +1,5 @@
 opam-version: "1.2"
-version: "2.0.3"
+version: "2.0.4"
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [
   "Vincent Bernardoff <vb@luminar.eu.org>"
@@ -22,12 +22,12 @@ build: [
 ]
 build-test: [make "tests"]
 depends: [
-  "opam-client" {= "2.0.3"}
+  "opam-client" {= "2.0.4"}
   "cmdliner" {>= "0.9.8"}
   "dune" {build & >= "1.2.1"}
 ]
 post-messages: [
-"The development version of opam has been successfuly compiled into %{lib}%/%{name}%. You should not run it from there, please install the binaries to your PATH, e.g. with
+"The development version of opam has been successfully compiled into %{lib}%/%{name}%. You should not run it from there, please install the binaries to your PATH, e.g. with
     sudo cp %{lib}%/%{name}%/* /usr/local/bin
 
 If you just want to give it a try without altering your current installation, you could use instead:

opam-format.opam

@@ -1,5 +1,5 @@
 opam-version: "1.2"
-version: "2.0.3"
+version: "2.0.4"
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [
   "Vincent Bernardoff <vb@luminar.eu.org>"
@@ -21,7 +21,7 @@ build: [
   [make "%{name}%.install"]
 ]
 depends: [
-  "opam-core" {= "2.0.3"}
+  "opam-core" {= "2.0.4"}
   "opam-file-format" {>= "2.0.0~rc2"}
   "dune" {build & >= "1.2.1"}
 ]

opam-installer.opam

@@ -1,5 +1,5 @@
 opam-version: "1.2"
-version: "2.0.3"
+version: "2.0.4"
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [
   "Vincent Bernardoff <vb@luminar.eu.org>"
@@ -21,7 +21,7 @@ build: [
   [make "%{name}%.install"]
 ]
 depends: [
-  "opam-format" {= "2.0.3"}
+  "opam-format" {= "2.0.4"}
   "cmdliner" {>= "0.9.8"}
   "dune" {build & >= "1.2.1"}
 ]

opam-repository.opam

@@ -1,5 +1,5 @@
 opam-version: "1.2"
-version: "2.0.3"
+version: "2.0.4"
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [
   "Vincent Bernardoff <vb@luminar.eu.org>"
@@ -21,7 +21,7 @@ build: [
   [make "%{name}%.install"]
 ]
 depends: [
-  "opam-format" {= "2.0.3"}
+  "opam-format" {= "2.0.4"}
   "dune" {build & >= "1.2.1"}
 ]
 available: ocaml-version >= "4.02.3"

opam-solver.opam

@@ -1,5 +1,5 @@
 opam-version: "1.2"
-version: "2.0.3"
+version: "2.0.4"
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [
   "Vincent Bernardoff <vb@luminar.eu.org>"
@@ -21,7 +21,7 @@ build: [
   [make "%{name}%.install"]
 ]
 depends: [
-  "opam-format" {= "2.0.3"}
+  "opam-format" {= "2.0.4"}
   "mccs" {>= "1.1+9"}
   "dose3" {>= "5"}
   "cudf" {>= "0.7"}

opam-state.opam

@@ -1,5 +1,5 @@
 opam-version: "1.2"
-version: "2.0.3"
+version: "2.0.4"
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [
   "Vincent Bernardoff <vb@luminar.eu.org>"
@@ -21,7 +21,7 @@ build: [
   [make "%{name}%.install"]
 ]
 depends: [
-  "opam-repository" {= "2.0.3"}
+  "opam-repository" {= "2.0.4"}
   "dune" {build & >= "1.2.1"}
 ]
 available: ocaml-version >= "4.02.3"