diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-03-09 17:48:53 +1300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-09 16:59:56 +0000 |
| commit | a08d12ad867c292f7474731a0fe5e51e712446d6 (patch) | |
| tree | 74c06d54b32ba57f77fd21e3d455fb3bc93fa1c7 /scripts/lib/recipetool | |
| parent | 8226805f83d21e7c1d2ba21969f3e8ee4b137496 (diff) | |
| download | openembedded-core-contrib-a08d12ad867c292f7474731a0fe5e51e712446d6.tar.gz | |
recipetool: create: check if npm available if npm:// URL specified
If the user specifies an npm:// URL then the fetcher needs npm to be
available to run, so check if it's available early rather than failing
later.
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')
| -rw-r--r-- | scripts/lib/recipetool/create.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py index 43c07848c2..1d48e36462 100644 --- a/scripts/lib/recipetool/create.py +++ b/scripts/lib/recipetool/create.py @@ -355,6 +355,12 @@ def create_recipe(args): srcuri = rev_re.sub('', srcuri) tempsrc = tempfile.mkdtemp(prefix='recipetool-') srctree = tempsrc + if fetchuri.startswith('npm://'): + # Check if npm is available + npm = bb.utils.which(tinfoil.config_data.getVar('PATH', True), 'npm') + if not npm: + logger.error('npm:// URL requested but npm is not available - you need to either build nodejs-native or install npm using your package manager') + sys.exit(1) logger.info('Fetching %s...' % srcuri) try: checksums = scriptutils.fetch_uri(tinfoil.config_data, fetchuri, srctree, srcrev) |