From 41d36ac1f9c6e21a6d63c2a2347559bc0a71db9d Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Fri, 2 Dec 2022 11:08:27 +0300 Subject: [PATCH] print meaningful error message if python3-markdown is not installed Updated: Mon, 08 Apr 2024 14:14:38 +0300 Debian-Specific: yes Forwarded: not-needed Gbp-Pq: Name meaningful-error-if-no-python3-markdown.patch --- python/samba/ms_forest_updates_markdown.py | 6 +++++- python/samba/ms_schema_markdown.py | 6 +++++- python/samba/netcmd/domain/schemaupgrade.py | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/python/samba/ms_forest_updates_markdown.py b/python/samba/ms_forest_updates_markdown.py index 0a0d2111..cd21034e 100644 --- a/python/samba/ms_forest_updates_markdown.py +++ b/python/samba/ms_forest_updates_markdown.py @@ -24,7 +24,11 @@ import re import os -import markdown +try: + import markdown +except ImportError as e: + e.add_note('Please install python3-markdown package') + raise import xml.etree.ElementTree as ET from samba.common import get_string diff --git a/python/samba/ms_schema_markdown.py b/python/samba/ms_schema_markdown.py index 8a9ad78b..953ce5e5 100644 --- a/python/samba/ms_schema_markdown.py +++ b/python/samba/ms_schema_markdown.py @@ -22,7 +22,11 @@ import re import os -import markdown +try: + import markdown +except ImportError as e: + e.add_note('Please install python3-markdown package') + raise import xml.etree.ElementTree as ET diff --git a/python/samba/netcmd/domain/schemaupgrade.py b/python/samba/netcmd/domain/schemaupgrade.py index ff00a771..85880263 100644 --- a/python/samba/netcmd/domain/schemaupgrade.py +++ b/python/samba/netcmd/domain/schemaupgrade.py @@ -229,7 +229,7 @@ class cmd_domain_schema_upgrade(Command): from samba.ms_schema_markdown import read_ms_markdown except ImportError as e: self.outf.write("Exception in importing markdown: %s\n" % e) - raise CommandError('Failed to import module markdown') + raise CommandError('Failed to import module markdown, please install python3-markdown package') from samba.schema import Schema updates_allowed_overridden = False -- 2.30.2