Merge pull request #3416 from ThomasWaldmann/backports

1.0 Backports

.travis.yml

@@ -37,6 +37,16 @@ matrix:
           osx_image: xcode6.4
           env: TOXENV=py36
 
+before_install:
+- |
+    test $TRAVIS_EVENT_TYPE != "pull_request" || {
+        echo Checking whether $TRAVIS_COMMIT_RANGE changed only docs
+        git diff --name-only $TRAVIS_COMMIT_RANGE | grep --quiet --invert-match --extended-regexp '(AUTHORS|README\.rst|^(docs)/)' || {
+            echo "Only docs were updated, stopping build process."
+            exit
+        }
+    }
+
 install:
     - git fetch --unshallow --tags
     - ./.travis/install.sh

.travis/install.sh

@@ -4,8 +4,6 @@ set -e
 set -x
 
 if [[ "$(uname -s)" == 'Darwin' ]]; then
-    brew update || brew update
-
     if [[ "${OPENSSL}" != "0.9.8" ]]; then
         brew outdated openssl || brew upgrade openssl
     fi

Vagrantfile

@@ -38,7 +38,7 @@ def packages_debianoid
     # this way it works on older dists (like ubuntu 12.04) also:
     # for python 3.2 on ubuntu 12.04 we need pip<8 and virtualenv<14 as
     # newer versions are not compatible with py 3.2 any more.
-    easy_install3 'pip<8.0'
+    easy_install3 -i https://pypi.python.org/simple/ 'pip<8.0'
     pip3 install 'virtualenv<14.0'
     touch $home_dir/.bash_profile ; chown $username $home_dir/.bash_profile
   EOF

borg/archiver.py

@@ -1285,6 +1285,9 @@ class Archiver:
         key_export_epilog = textwrap.dedent("""
         If repository encryption is used, the repository is inaccessible
         without the key. This command allows to backup this essential key.
+        Note that the backup produced does not include the passphrase itself
+        (i.e. the exported key stays encrypted). In order to regain access to a
+        repository, one needs both the exported key and the original passphrase.
 
         There are two backup formats. The normal backup format is suitable for
         digital storage as a file. The ``--paper`` backup format is optimized