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

diff --git a/python/samba/ms_forest_updates_markdown.py b/python/samba/ms_forest_updates_markdown.py
index 0a0d2111a7211f01a31289d975f972b75ba94506..cd21034ee358341b84a7360a02c0590bfe411c37 100644 (file)
--- 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 8a9ad78b870df4c3f61d8afec331c662975dd872..953ce5e51ca19f0c61bbf27f65142d51f8b9b5ee 100644 (file)
--- 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 33b942ca460c85833c5dd3f80c95e33a5853cb70..f0a5654a615f869e4ae4f953df8b89b5f2d95a2f 100644 (file)
--- 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