diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 13:04:46 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 13:04:46 +0000 |
| commit | 686a7454a54dee5eebf8d3d1bc9e16a5917beec9 (patch) | |
| tree | b74743547fc5d7aa62cc526ea62b61e5ac043712 /debian/patches/meaningful-error-if-no-python3-markdown.patch | |
| parent | Merging upstream version 2:4.20.1+dfsg. (diff) | |
| download | samba-686a7454a54dee5eebf8d3d1bc9e16a5917beec9.tar.xz samba-686a7454a54dee5eebf8d3d1bc9e16a5917beec9.zip | |
Merging debian version 2:4.20.1+dfsg-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/meaningful-error-if-no-python3-markdown.patch')
| -rw-r--r-- | debian/patches/meaningful-error-if-no-python3-markdown.patch | 40 |
1 files changed, 35 insertions, 5 deletions
diff --git a/debian/patches/meaningful-error-if-no-python3-markdown.patch b/debian/patches/meaningful-error-if-no-python3-markdown.patch index 80ffd73..da085f9 100644 --- a/debian/patches/meaningful-error-if-no-python3-markdown.patch +++ b/debian/patches/meaningful-error-if-no-python3-markdown.patch @@ -1,14 +1,10 @@ From: Michael Tokarev <mjt@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 as e: ++ e.add_note('Please install python3-markdown package') ++ raise + import xml.etree.ElementTree as ET + + |