summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrendan Le Foll <brendan.le.foll@intel.com>2016-03-11 10:32:58 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-12 09:35:52 +0000
commit3c66619d50921a17b911f99f095baac3a049cad3 (patch)
treea5ec778e04e9702a597f97458b7bd867d07f2ea4
parent01554725f5f3e248cff951731e9b9fc7794e68ba (diff)
downloadopenembedded-core-contrib-3c66619d50921a17b911f99f095baac3a049cad3.tar.gz
openembedded-core-contrib-3c66619d50921a17b911f99f095baac3a049cad3.tar.bz2
openembedded-core-contrib-3c66619d50921a17b911f99f095baac3a049cad3.zip
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>
-rw-r--r--bitbake/lib/bb/fetch2/npm.py2
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):
if not ud.version:
raise ParameterError("NPM fetcher requires a version parameter", ud.url)
ud.bbnpmmanifest = "%s-%s.deps.json" % (ud.pkgname, ud.version)
- ud.registry = "http://%s" % ud.basename
+ ud.registry = "http://%s" % (ud.url.replace('npm://', '', 1).split(';'))[0]
prefixdir = "npm/%s" % ud.pkgname
ud.pkgdatadir = d.expand("${DL_DIR}/%s" % prefixdir)
if not os.path.exists(ud.pkgdatadir):