diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-11-25 16:06:00 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-11-25 16:06:00 +0000 |
| commit | 0b27c4220582a5997b3ff3dba315ef68d613c5c2 (patch) | |
| tree | 9ecc7ce0714a8ac2f30e303ce9d04d87800f75b4 | |
| parent | Refreshing use-python3.patch. (diff) | |
| download | netdata-0b27c4220582a5997b3ff3dba315ef68d613c5c2.tar.xz netdata-0b27c4220582a5997b3ff3dba315ef68d613c5c2.zip | |
Adding patch to use system pyaml3 directly rather than first trying embedded copy (that is removed in Debian).
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
| -rw-r--r-- | debian/patches/debian/0006-use-pyaml3.patch | 18 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 19 insertions, 0 deletions
diff --git a/debian/patches/debian/0006-use-pyaml3.patch b/debian/patches/debian/0006-use-pyaml3.patch new file mode 100644 index 000000000..2ba4106f8 --- /dev/null +++ b/debian/patches/debian/0006-use-pyaml3.patch @@ -0,0 +1,18 @@ +Author: Daniel Baumann <daniel@debian.org> +Description: Use system pyaml3 directly rather than first trying embedded copy (that is removed in Debian). + +diff -Naurp netdata.orig/src/collectors/python.d.plugin/python_modules/bases/loaders.py netdata/src/collectors/python.d.plugin/python_modules/bases/loaders.py +--- netdata.orig/src/collectors/python.d.plugin/python_modules/bases/loaders.py ++++ netdata/src/collectors/python.d.plugin/python_modules/bases/loaders.py +@@ -3,10 +3,7 @@ + # Author: Ilya Mashchenko (ilyam8) + # SPDX-License-Identifier: GPL-3.0-or-later + +-try: +- from pyyaml3 import SafeLoader as YamlSafeLoader +-except ImportError: +- from yaml import SafeLoader as YamlSafeLoader ++from yaml import SafeLoader as YamlSafeLoader + + try: + from collections import OrderedDict diff --git a/debian/patches/series b/debian/patches/series index 17a2f5a33..af71112fc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ debian/0003-use-python3.patch debian/0004-use-bash.patch debian/0005-send-email.patch +debian/0006-use-pyaml3.patch |