From c1dc58d90a8403b3a5e1be92a86c9e3ef8a39bd7 Mon Sep 17 00:00:00 2001 From: SebB Date: Thu, 21 Mar 2024 10:56:54 +0000 Subject: [PATCH 1/2] fix: Import correct YAML library to resolve compatibility issue --- contrib/feeds-config-generator/intelmq_gen_feeds_conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/feeds-config-generator/intelmq_gen_feeds_conf b/contrib/feeds-config-generator/intelmq_gen_feeds_conf index ad2621422..cb412ab96 100644 --- a/contrib/feeds-config-generator/intelmq_gen_feeds_conf +++ b/contrib/feeds-config-generator/intelmq_gen_feeds_conf @@ -8,7 +8,8 @@ import json import sys try: - import yaml + from ruamel.yaml import YAML + yaml = YAML(typ="safe", pure=True) except ImportError: print("[-] Please install yaml using the following command: 'pip install pyyaml'.", file=sys.stderr) sys.exit(-1) From 59512011456a1c77927485cd45acee56046605e8 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 25 Mar 2024 14:58:05 +0100 Subject: [PATCH 2/2] intelmq_gen_feeds_conf: error message for ruamel.yaml --- contrib/feeds-config-generator/intelmq_gen_feeds_conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/feeds-config-generator/intelmq_gen_feeds_conf b/contrib/feeds-config-generator/intelmq_gen_feeds_conf index cb412ab96..1dc3064f5 100644 --- a/contrib/feeds-config-generator/intelmq_gen_feeds_conf +++ b/contrib/feeds-config-generator/intelmq_gen_feeds_conf @@ -11,7 +11,7 @@ try: from ruamel.yaml import YAML yaml = YAML(typ="safe", pure=True) except ImportError: - print("[-] Please install yaml using the following command: 'pip install pyyaml'.", file=sys.stderr) + print("[-] Please install ruamel.yaml using the following command: 'pip install ruamel.yaml'.", file=sys.stderr) sys.exit(-1)