[Pkg-samba-maint] [Git][samba-team/samba][master] meaningful-error-if-no-python3-markdown.patch: update to include 2 other...

[Michael Tokarev (@mjt)]

Michael Tokarev pushed to branch master at Debian Samba Team / samba


Commits:
03c2638c by Michael Tokarev at 2024-04-08T14:18:32+03:00
meaningful-error-if-no-python3-markdown.patch: update to include 2 other places where markdown gets improted

- - - - -


1 changed file:

- debian/patches/meaningful-error-if-no-python3-markdown.patch


Changes:

=====================================
debian/patches/meaningful-error-if-no-python3-markdown.patch
=====================================
@@ -1,14 +1,10 @@
 From: Michael Tokarev <mjt at tls.msk.ru>
 Date: Fri, 2 Dec 2022 11:08:27 +0300
-Updated: Thu, 03 Aug 2023 17:10:59 +0300
+Updated: Mon, 08 Apr 2024 14:14:38 +0300
 Subject: print meaningful error message if python3-markdown is not installed
 Debian-Specific: yes
 Forwarded: not-needed
 
----
- python/samba/netcmd/domain/schemaupgrade.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
 diff --git a/python/samba/netcmd/domain/schemaupgrade.py b/python/samba/netcmd/domain/schemaupgrade.py
 index 1d67ab58c15..858802635a2 100644
 --- a/python/samba/netcmd/domain/schemaupgrade.py
@@ -22,3 +18,37 @@ index 1d67ab58c15..858802635a2 100644
 +            raise CommandError('Failed to import module markdown, please install python3-markdown package')
          from samba.schema import Schema
  
+diff --git a/python/samba/ms_forest_updates_markdown.py b/python/samba/ms_forest_updates_markdown.py
+index 0a0d2111a72..a5ef6ec7279 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 8a9ad78b870..9af9406081b 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 e:
++    e.add_note('Please install python3-markdown package')
++    raise
+ import xml.etree.ElementTree as ET
+ 
+ 



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/commit/03c2638cc0023cd09894ab37f965c1cab7836701

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/commit/03c2638cc0023cd09894ab37f965c1cab7836701
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-samba-maint/attachments/20240408/f636e0a1/attachment-0001.htm>