diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2012-04-03 16:12:54 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2012-04-03 17:46:42 +0200 |
| commit | 5d10b499bf206ca3f04219d17d88849182eb06f5 (patch) | |
| tree | c1bde18678b7124de986619bb563776b381ca3ec | |
| parent | 22a6497526812becab60f8e49ab13d9155986ae1 (diff) | |
| download | samba-5d10b499bf206ca3f04219d17d88849182eb06f5.tar.gz samba-5d10b499bf206ca3f04219d17d88849182eb06f5.tar.bz2 samba-5d10b499bf206ca3f04219d17d88849182eb06f5.zip | |
wafsamba: Avoid NameError when printing error about missing system deps.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Tue Apr 3 17:46:42 CEST 2012 on sn-devel-104
| -rw-r--r-- | buildtools/wafsamba/samba_bundled.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py index a29bfa3a1b..e13da9f612 100644 --- a/buildtools/wafsamba/samba_bundled.py +++ b/buildtools/wafsamba/samba_bundled.py @@ -84,11 +84,12 @@ def LIB_MUST_BE_BUNDLED(conf, libname): @conf def CHECK_PREREQUISITES(conf, prereqs): + missing = [] for syslib in TO_LIST(prereqs): f = 'FOUND_SYSTEMLIB_%s' % syslib if not f in conf.env: - return False - return True + missing.append(syslib) + return syslib @runonce @@ -109,9 +110,10 @@ def CHECK_BUNDLED_SYSTEM_PKG(conf, libname, minversion='0.0.0', # system version is found. That prevents possible use of mixed library # versions if onlyif: - if not conf.CHECK_PREREQUISITES(onlyif): + missing = conf.CHECK_PREREQUISITES(onlyif) + if missing: if not conf.LIB_MAY_BE_BUNDLED(libname): - Logs.error('ERROR: Use of system library %s depends on missing system library %s' % (libname, onlyif)) + Logs.error('ERROR: Use of system library %s depends on missing system library/libraries %r' % (libname, missing)) sys.exit(1) conf.env[found] = False return False @@ -169,9 +171,10 @@ def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0', # system version is found. That prevents possible use of mixed library # versions if onlyif: - if not conf.CHECK_PREREQUISITES(onlyif): + missing = conf.CHECK_PREREQUISITES(onlyif) + if missing: if not conf.LIB_MAY_BE_BUNDLED(libname): - Logs.error('ERROR: Use of system library %s depends on missing system library %s' % (libname, syslib)) + Logs.error('ERROR: Use of system library %s depends on missing system library/libraries %r' % (libname, missing)) sys.exit(1) conf.env[found] = False return False |