diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 17:20:02 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 17:20:02 +0000 |
commit | 0a354ad0b2c9eaaa204c31db478da109dc6d2a8b (patch) | |
tree | 2467caa8ad20a7fca31bef64224e41a4238db0c9 /debian/patches/meaningful-error-if-no-samba-ad-provision.patch | |
parent | Adding upstream version 2:4.20.0+dfsg. (diff) | |
download | samba-3a2c5cebcb36894f34647fd035da7b843421d7c8.tar.xz samba-3a2c5cebcb36894f34647fd035da7b843421d7c8.zip |
Adding debian version 2:4.20.0+dfsg-1~exp1.debian/2%4.20.0+dfsg-1_exp1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/meaningful-error-if-no-samba-ad-provision.patch')
-rw-r--r-- | debian/patches/meaningful-error-if-no-samba-ad-provision.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/debian/patches/meaningful-error-if-no-samba-ad-provision.patch b/debian/patches/meaningful-error-if-no-samba-ad-provision.patch new file mode 100644 index 0000000..f7bae51 --- /dev/null +++ b/debian/patches/meaningful-error-if-no-samba-ad-provision.patch @@ -0,0 +1,25 @@ +From: Michael Tokarev <mjt@tls.msk.ru> +Date: Fri, 2 Dec 2022 10:54:31 +0300 +Updated: Thu, 03 Aug 2023 17:06:24 +0300 +Subject: print meaningful error message if samba-ad-provision is not installed +Debian-Specific: yes +Forwarded: not-needed + +--- + python/samba/provision/common.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/python/samba/provision/common.py b/python/samba/provision/common.py +index a6851b7e4c1..935918aa73f 100644 +--- a/python/samba/provision/common.py ++++ b/python/samba/provision/common.py +@@ -40,5 +40,8 @@ FILL_DRS = "DRS" + def setup_path(file): + """Return an absolute path to the provision template file specified by file""" +- return os.path.join(setup_dir(), file) ++ path = os.path.join(setup_dir(), file) ++ if not os.path.exists(path): ++ raise Exception("File [%s] not found. Please install samba-ad-provision package" % path) ++ return path + + |