summaryrefslogtreecommitdiffstats
path: root/scripts/lib/recipetool/create_npm.py
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-04-12 17:14:26 +1200
committerPaul Eggleton <paul.eggleton@linux.intel.com>2017-04-12 22:39:31 +1200
commit5c24a70930d011375e353b5db3b52361fe16e40e (patch)
tree541f164af70d5edd5f1a21d668af3e2b7baeebe1 /scripts/lib/recipetool/create_npm.py
parent69c8ef135d4443e2d1ad8873d205d8d27d699546 (diff)
downloadopenembedded-core-contrib-5c24a70930d011375e353b5db3b52361fe16e40e.tar.gz
openembedded-core-contrib-5c24a70930d011375e353b5db3b52361fe16e40e.tar.bz2
openembedded-core-contrib-5c24a70930d011375e353b5db3b52361fe16e40e.zip
recipetool: create: hide missing npm error when called from devtoolpaule/npm-fixes3
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. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'scripts/lib/recipetool/create_npm.py')
-rw-r--r--scripts/lib/recipetool/create_npm.py2
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):
files = RecipeHandler.checkfiles(srctree, ['package.json'])
if files:
d = bb.data.createCopy(tinfoil.config_data)
- npm_bindir = check_npm(tinfoil)
+ npm_bindir = check_npm(tinfoil, self._devtool)
d.prependVar('PATH', '%s:' % npm_bindir)
data = read_package_json(files[0])