mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4528 from shawnl/back-port 

2 forward ports
This commit is contained in:
TW 2019-05-12 19:09:44 +02:00 committed by GitHub
parent 2bc0b1e973 742f978b89
commit 320b935c97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README.rst
View File

@ -126,15 +126,16 @@ Now doing another backup, just to show off the great deduplication::
For a graphical frontend refer to our complementary project `BorgWeb <https://borgweb.readthedocs.io/>`_. For a graphical frontend refer to our complementary project `BorgWeb <https://borgweb.readthedocs.io/>`_.
Helping, Donations and Bounties Helping, Donations and Bounties, becoming a Patron
------------------------------- --------------------------------------------------
Your help is always welcome! Your help is always welcome!
Spread the word, give feedback, help with documentation, testing or development. Spread the word, give feedback, help with documentation, testing or development.
You can also give monetary support to the project, see there for details: You can also give monetary support to the project, see there for details:
https://www.borgbackup.org/support/free.html#bounties-and-fundraisers https://www.borgbackup.org/support/fund.html
Links Links
----- -----

8
src/borg/archiver.py
View File

@ -4276,8 +4276,10 @@ class Archiver:
parser.error('Need at least one PATH argument.') parser.error('Need at least one PATH argument.')
return args return args
def prerun_checks(self, logger): def prerun_checks(self, logger, is_serve):
check_python() if not is_serve:
# this is the borg *client*, we need to check the python:
check_python()
check_extension_modules() check_extension_modules()
selftest(logger) selftest(logger)
@ -4319,7 +4321,7 @@ class Archiver:
return self.exit_code return self.exit_code
if args.show_version: if args.show_version:
logging.getLogger('borg.output.show-version').info('borgbackup version %s' % __version__) logging.getLogger('borg.output.show-version').info('borgbackup version %s' % __version__)
self.prerun_checks(logger) self.prerun_checks(logger, is_serve)
if not is_supported_msgpack(): if not is_supported_msgpack():
logger.error("You do not have a supported version of the msgpack python package installed. Terminating.") logger.error("You do not have a supported version of the msgpack python package installed. Terminating.")
logger.error("This should never happen as specific, supported versions are required by our setup.py.") logger.error("This should never happen as specific, supported versions are required by our setup.py.")