diff options
| author | Brendan Le Foll <brendan.le.foll@intel.com> | 2016-03-11 10:32:58 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-12 09:35:52 +0000 |
| commit | 3c66619d50921a17b911f99f095baac3a049cad3 (patch) | |
| tree | a5ec778e04e9702a597f97458b7bd867d07f2ea4 /bitbake | |
| parent | 01554725f5f3e248cff951731e9b9fc7794e68ba (diff) | |
| download | poky-3c66619d50921a17b911f99f095baac3a049cad3.tar.gz | |
bitbake: fetch2/npm: fix ud.registry so that alternative registries can be handled
Fixes [YOCTO #9231]
npm when given an invalid registry URL with --registry actually goes and
fetches from the default registry, but this commit makes sure it goes to the
specified one.
(Bitbake rev: 7c849be7c70a5db4f66fe3041486abb923b5e4ee)
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/bb/fetch2/npm.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/npm.py b/bitbake/lib/bb/fetch2/npm.py index d44454cb2c..e8d9b11099 100644 --- a/bitbake/lib/bb/fetch2/npm.py +++ b/bitbake/lib/bb/fetch2/npm.py | |||
| @@ -80,7 +80,7 @@ class Npm(FetchMethod): | |||
| 80 | if not ud.version: | 80 | if not ud.version: |
| 81 | raise ParameterError("NPM fetcher requires a version parameter", ud.url) | 81 | raise ParameterError("NPM fetcher requires a version parameter", ud.url) |
| 82 | ud.bbnpmmanifest = "%s-%s.deps.json" % (ud.pkgname, ud.version) | 82 | ud.bbnpmmanifest = "%s-%s.deps.json" % (ud.pkgname, ud.version) |
| 83 | ud.registry = "http://%s" % ud.basename | 83 | ud.registry = "http://%s" % (ud.url.replace('npm://', '', 1).split(';'))[0] |
| 84 | prefixdir = "npm/%s" % ud.pkgname | 84 | prefixdir = "npm/%s" % ud.pkgname |
| 85 | ud.pkgdatadir = d.expand("${DL_DIR}/%s" % prefixdir) | 85 | ud.pkgdatadir = d.expand("${DL_DIR}/%s" % prefixdir) |
| 86 | if not os.path.exists(ud.pkgdatadir): | 86 | if not os.path.exists(ud.pkgdatadir): |