From 13bffa02d8a349b21bace8d96d0ae5af6d75e00b Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 17 Feb 2011 15:14:57 +1100 Subject: waf: improved error message for bad paths in SAMBA_LIBRARY() Pair-Programmed-With: Andrew Bartlett --- buildtools/wafsamba/wafsamba.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'buildtools/wafsamba/wafsamba.py') diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 4c9bf053a1..8c42966057 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -218,7 +218,13 @@ def SAMBA_LIBRARY(bld, libname, source, bld.ABI_VSCRIPT(libname, abi_directory, version, vscript, abi_match) fullname = apply_pattern(bundled_name, bld.env.shlib_PATTERN) - bld.add_manual_dependency(bld.path.find_or_declare(fullname), bld.path.find_or_declare(vscript)) + fullpath = bld.path.find_or_declare(fullname) + vscriptpath = bld.path.find_or_declare(vscript) + if not fullpath: + raise Utils.WafError("unable to find fullpath for %s" % fullname) + if not vscriptpath: + raise Utils.WafError("unable to find vscript path for %s" % vscript) + bld.add_manual_dependency(fullpath, vscriptpath) if Options.is_install: # also make the .inst file depend on the vscript instname = apply_pattern(bundled_name + '.inst', bld.env.shlib_PATTERN) -- cgit