From: Amit Kumar Date: Mon, 2 Sep 2019 09:26:08 +0000 (-0500) Subject: samba-tool domain: fix an unhandled exception X-Git-Tag: talloc-2.3.1~264 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce3fdc4dee373a2f9ab55ffa83a97ac690109b09;p=thirdparty%2Fsamba.git samba-tool domain: fix an unhandled exception Uncaught exception on running 'samba-tool domain schemaupgrade' ERROR(): uncaught exception - No module named 'markdown' File "/usr/lib64/python3.7/site-packages/samba/netcmd/__init__.py", line 185, in _run return self.run(*args, **kwargs) File "/usr/lib64/python3.7/site-packages/samba/netcmd/domain.py", line 4157, in run from samba.ms_schema_markdown import read_ms_markdown File "/usr/lib64/python3.7/site-packages/samba/ms_schema_markdown.py", line 26, in import markdown Signed-off-by: Amit Kumar amitkuma@redhat.com Reviewed-by: Ralph Boehme Reviewed-by: Andrew Bartlett --- diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py index 9d44d6d5ea4..80811154d4d 100644 --- a/python/samba/netcmd/domain.py +++ b/python/samba/netcmd/domain.py @@ -4110,7 +4110,11 @@ class cmd_domain_schema_upgrade(Command): return count def run(self, **kwargs): - from samba.ms_schema_markdown import read_ms_markdown + try: + from samba.ms_schema_markdown import read_ms_markdown + except ImportError as e: + self.outf.write("Exception in importing markdown: %s" % e) + raise CommandError('Failed to import module markdown') from samba.schema import Schema updates_allowed_overridden = False