Merge pull request #4528 from shawnl/back-port

2 forward ports

README.rst

@@ -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/>`_.
 
-Helping, Donations and Bounties
--------------------------------
+Helping, Donations and Bounties, becoming a Patron
+--------------------------------------------------
 
 Your help is always welcome!
+
 Spread the word, give feedback, help with documentation, testing or development.
 
 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
 -----

src/borg/archiver.py

@@ -4276,8 +4276,10 @@ class Archiver:
             parser.error('Need at least one PATH argument.')
         return args
 
-    def prerun_checks(self, logger):
-        check_python()
+    def prerun_checks(self, logger, is_serve):
+        if not is_serve:
+            # this is the borg *client*, we need to check the python:
+            check_python()
         check_extension_modules()
         selftest(logger)
 
@@ -4319,7 +4321,7 @@ class Archiver:
             return self.exit_code
         if args.show_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():
             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.")