mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-04-14 02:02:30 +02:00
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
Adapted from https://github.com/borgbackup/borg/commit/39761ebadc9325a7cc7e931144e2709effe8f0f0
|
|
|
|
References:
|
|
https://github.com/borgbackup/borg/issues/7810
|
|
https://github.com/borgbackup/borg/pull/7840
|
|
https://github.com/borgbackup/borg/pull/7850
|
|
|
|
--
|
|
From 39761ebadc9325a7cc7e931144e2709effe8f0f0 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Waldmann <tw@waldmann-edv.de>
|
|
Date: Thu, 28 Sep 2023 14:26:48 +0200
|
|
Subject: [PATCH] allow msgpack 1.0.7
|
|
|
|
---
|
|
setup.py | 2 +-
|
|
src/borg/helpers/msgpack.py | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/setup.py b/setup.py
|
|
index f207b6133d..9a03438164 100644
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -70,7 +70,7 @@
|
|
# Please note:
|
|
# using any other msgpack version is not supported by borg development and
|
|
# any feedback related to issues caused by this will be ignored.
|
|
- 'msgpack >=0.5.6, <=1.0.5, !=1.0.1',
|
|
+ 'msgpack >=0.5.6, <=1.0.7, !=1.0.1',
|
|
'packaging',
|
|
]
|
|
|
|
diff --git a/src/borg/helpers/msgpack.py b/src/borg/helpers/msgpack.py
|
|
index b9496696a9..197d2debd8 100644
|
|
--- a/src/borg/helpers/msgpack.py
|
|
+++ b/src/borg/helpers/msgpack.py
|
|
@@ -182,7 +182,7 @@ 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, 5) and \
|
|
+ return (0, 5, 6) <= msgpack.version <= (1, 0, 7) and \
|
|
msgpack.version not in [(1, 0, 1), ] # < add bad releases here to deny list
|
|
|
|
|