summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-02-17 15:14:57 +1100
committerAndrew Tridgell <tridge@samba.org>2011-02-18 15:09:47 +1100
commit13bffa02d8a349b21bace8d96d0ae5af6d75e00b (patch)
treebfbfe9b2a1d45e1e87a4b89fb1cdd77d76487cd7
parent1c5108c98b51c7c3edcd94d3a238d0476ece53dd (diff)
downloadsamba-13bffa02d8a349b21bace8d96d0ae5af6d75e00b.tar.gz
samba-13bffa02d8a349b21bace8d96d0ae5af6d75e00b.tar.bz2
samba-13bffa02d8a349b21bace8d96d0ae5af6d75e00b.zip
waf: improved error message for bad paths in SAMBA_LIBRARY()
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--buildtools/wafsamba/wafsamba.py8
1 files changed, 7 insertions, 1 deletions
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)