From 12d9110882da6fb72537f243dd6bc09cb96c615f Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 30 Jan 2021 21:10:53 +0100 Subject: [PATCH] also accept msgpack up to 1.0.2 exclude 1.0.1 though, which had some issues (not sure whether they affect borg). --- setup.py | 2 +- src/borg/helpers/msgpack.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index a9ee6bdcf..09fb2fda5 100644 --- a/setup.py +++ b/setup.py @@ -67,7 +67,7 @@ on_rtd = os.environ.get('READTHEDOCS') install_requires = [ # we are rather picky about msgpack versions, because a good working msgpack is # very important for borg, see: https://github.com/borgbackup/borg/issues/3753 - 'msgpack >=0.5.6, <=1.0.0', + 'msgpack >=0.5.6, <=1.0.2, !=1.0.1', # Please note: # using any other version is not supported by borg development and # any feedback related to issues caused by this will be ignored. diff --git a/src/borg/helpers/msgpack.py b/src/borg/helpers/msgpack.py index 84c1301f1..71e5a4925 100644 --- a/src/borg/helpers/msgpack.py +++ b/src/borg/helpers/msgpack.py @@ -182,8 +182,8 @@ def is_slow_msgpack(): def is_supported_msgpack(): # DO NOT CHANGE OR REMOVE! See also requirements and comments in setup.py. import msgpack - return (0, 5, 6) <= msgpack.version <= (1, 0, 0) and \ - msgpack.version not in [] # < add bad releases here to deny list + return (0, 5, 6) <= msgpack.version <= (1, 0, 2) and \ + msgpack.version not in [(1, 0, 1), ] # < add bad releases here to deny list def get_limited_unpacker(kind):