diff options
| author |   Andreas Oberritter <obi@opendreambox.org> | 2014-04-11 20:56:13 +0200 |
|---|---|---|
| committer |   Saul Wold <sgw@linux.intel.com> | 2014-05-23 09:09:38 -0700 |
| commit | ef5892a2cd8eb85ba8de47a970122a8a6d5724ad (patch) | |
| tree | 128c3eceed368a3756e96453d52a9aad5b17644f /meta/classes | |
| parent | 3550355391a8920911e0dc68f01690afff7003b2 (diff) | |
| download | openembedded-core-ef5892a2cd8eb85ba8de47a970122a8a6d5724ad.tar.gz | |
recipe_sanity.bbclass: avoid error when running 'bitbake -e'
Running 'bitbake -e' without further arguments causes a stack trace on stderr:
| ERROR: Command execution failed: Traceback (most recent call last):
| File "[...]/bitbake/lib/bb/command.py", line 99, in runAsyncCommand
| commandmethod(self.cmds_async, self, options)
| File "[...]/bitbake/lib/bb/command.py", line 405, in showEnvironment
| command.cooker.showEnvironment(bfile)
| File "[...]/bitbake/lib/bb/cooker.py", line 453, in showEnvironment
| logger.plain("\npython %s () {\n%s}\n", e, data.getVar(e, envdata, 1))
| File "[...]/bitbake/lib/bb/data.py", line 89, in getVar
| return d.getVar(var, exp)
| File "[...]/bitbake/lib/bb/data_smart.py", line 522, in getVar
| return self.getVarFlag(var, "_content", expand, noweakdefault)
| File "[...]/bitbake/lib/bb/data_smart.py", line 612, in getVarFlag
| value = self.expand(value, cachename)
| File "[...]/bitbake/lib/bb/data_smart.py", line 350, in expand
| return self.expandWithRefs(s, varname).value
| File "[...]/bitbake/lib/bb/data_smart.py", line 340, in expandWithRefs
| raise ExpansionError(varname, s, exc)
| ExpansionError: Failure expanding variable can_delete_FILESPATH, expression was def can_delete_FILESPATH(cfgdata, d):
| expected = cfgdata.get("FILESPATH")
| #expected = "${@':'.join([os.path.normpath(os.path.join(fp, p, o)) for fp in d.getVar('FILESPATHBASE', True).split(':') for p in d.getVar('FILESPATHPKG', True).split(':') for o in (d.getVar('OVERRIDES', True) + ':').split(':') if os.path.exists(os.path.join(fp, p, o))])}:${FILESDIR}"
| expectedpaths = d.expand(expected)
| unexpanded = d.getVar("FILESPATH", 0)
| filespath = d.getVar("FILESPATH", True).split(":")
| filespath = [os.path.normpath(f) for f in filespath if os.path.exists(f)]
| for fp in filespath:
| if not fp in expectedpaths:
| # __note("Path %s in FILESPATH not in the expected paths %s" %
| # (fp, expectedpaths), d)
| return False
| return expected != unexpanded
| which triggered exception AttributeError: 'NoneType' object has no attribute 'split'
Removing the commented second line in can_delete_FILESPATH() hides the error.
(From OE-Core rev: a84c36e0e5e8332ddc5a6c34e1f598d5cb87cee2)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/recipe_sanity.bbclass | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/meta/classes/recipe_sanity.bbclass b/meta/classes/recipe_sanity.bbclass index 5dd4624f40..ee04e333db 100644 --- a/meta/classes/recipe_sanity.bbclass +++ b/meta/classes/recipe_sanity.bbclass @@ -59,7 +59,6 @@ def can_use_autotools_base(cfgdata, d): def can_delete_FILESPATH(cfgdata, d): expected = cfgdata.get("FILESPATH") - #expected = "${@':'.join([os.path.normpath(os.path.join(fp, p, o)) for fp in d.getVar('FILESPATHBASE', True).split(':') for p in d.getVar('FILESPATHPKG', True).split(':') for o in (d.getVar('OVERRIDES', True) + ':').split(':') if os.path.exists(os.path.join(fp, p, o))])}:${FILESDIR}" expectedpaths = d.expand(expected) unexpanded = d.getVar("FILESPATH", 0) filespath = d.getVar("FILESPATH", True).split(":") |