summaryrefslogtreecommitdiffstats
path: root/debian/patches/0006-use-system-python-yaml-library.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/0006-use-system-python-yaml-library.patch')
-rw-r--r--debian/patches/0006-use-system-python-yaml-library.patch29
1 files changed, 0 insertions, 29 deletions
diff --git a/debian/patches/0006-use-system-python-yaml-library.patch b/debian/patches/0006-use-system-python-yaml-library.patch
deleted file mode 100644
index ab08fc56d..000000000
--- a/debian/patches/0006-use-system-python-yaml-library.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Lennart Weller <lhw@ring0.de>
-Date: Mon, 18 Sep 2017 13:19:18 +0200
-Subject: use system python-yaml library
-
----
- plugins.d/python.d.plugin | 9 +--------
- 1 file changed, 1 insertion(+), 8 deletions(-)
-
-diff --git a/plugins.d/python.d.plugin b/plugins.d/python.d.plugin
-index 03c156f..af200d0 100755
---- a/plugins.d/python.d.plugin
-+++ b/plugins.d/python.d.plugin
-@@ -58,15 +58,8 @@ except (AssertionError, ImportError):
- msg.info('Using python v2')
- except ImportError:
- msg.fatal('Cannot start. No importlib.machinery on python3 or lack of imp on python2')
--# try:
--# import yaml
--# except ImportError:
--# msg.fatal('Cannot find yaml library')
- try:
-- if PY_VERSION == 3:
-- import pyyaml3 as yaml
-- else:
-- import pyyaml2 as yaml
-+ import yaml
- except ImportError:
- msg.fatal('Cannot find yaml library')
-