diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2017-04-12 22:41:29 +1200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-04-13 10:54:10 +0100 |
commit | 40d17719441c3e6865b0f35b40c2f98386671903 (patch) | |
tree | fcee780ddced467028a31ba1c9bf6a1e03754f82 /scripts/lib/recipetool/create_npm.py | |
parent | 48f8d1201a0342ba5253c276df504fcb986b8245 (diff) | |
download | poky-40d17719441c3e6865b0f35b40c2f98386671903.tar.gz |
recipetool: create: hide missing npm error when called from devtool
If devtool is called with a URL to a source repository containing a
node.js module, we don't know that until recipetool has fetched it, and
due to the structure of the code we have to exit with a special code in
order to let devtool know it needs to build nodejs-native. We also want
to suppress the error message that recipetool would normally print under
these circumstances; there is already a mechanism for this but it wasn't
operative in the case where we're pointed to a source repository rather
than an npm:// URL, so create some plumbing so that we know to hide the
message.
(From OE-Core rev: 0c2d0fbb1c6c5b82183799eb7ef80074f86bcfc4)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/recipetool/create_npm.py')
-rw-r--r-- | scripts/lib/recipetool/create_npm.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/recipetool/create_npm.py b/scripts/lib/recipetool/create_npm.py index a79a9afbb1..cb8f338b8b 100644 --- a/scripts/lib/recipetool/create_npm.py +++ b/scripts/lib/recipetool/create_npm.py | |||
@@ -189,7 +189,7 @@ class NpmRecipeHandler(RecipeHandler): | |||
189 | files = RecipeHandler.checkfiles(srctree, ['package.json']) | 189 | files = RecipeHandler.checkfiles(srctree, ['package.json']) |
190 | if files: | 190 | if files: |
191 | d = bb.data.createCopy(tinfoil.config_data) | 191 | d = bb.data.createCopy(tinfoil.config_data) |
192 | npm_bindir = check_npm(tinfoil) | 192 | npm_bindir = check_npm(tinfoil, self._devtool) |
193 | d.prependVar('PATH', '%s:' % npm_bindir) | 193 | d.prependVar('PATH', '%s:' % npm_bindir) |
194 | 194 | ||
195 | data = read_package_json(files[0]) | 195 | data = read_package_json(files[0]) |