[oe-commits] [bitbake] 01/02: npm: in cases where shrinkwrap resolved a git URL, ignore it and grab dist.tarball
git at git.openembedded.org
git at git.openembedded.org
Mon Feb 29 17:39:46 UTC 2016
rpurdie pushed a commit to branch master-next
in repository bitbake.
commit d3d03928a5fa57a2abcd0a6450a4b3b105154de8
Author: Brendan Le Foll <brendan.le.foll at intel.com>
AuthorDate: Mon Feb 29 14:27:43 2016 +0000
npm: in cases where shrinkwrap resolved a git URL, ignore it and grab dist.tarball
npm-shrinkwrap will sometimes resolve a git URL which instead of a http url, in
this case go and grab the dist.tarball via npm instead of using the resolved
URL.
Signed-off-by: Brendan Le Foll <brendan.le.foll at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
lib/bb/fetch2/npm.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/bb/fetch2/npm.py b/lib/bb/fetch2/npm.py
index 7d5e891..46644f1 100644
--- a/lib/bb/fetch2/npm.py
+++ b/lib/bb/fetch2/npm.py
@@ -175,7 +175,7 @@ class Npm(FetchMethod):
def _getshrinkeddependencies(self, pkg, data, version, d, ud, lockdown, manifest):
logger.debug(2, "NPM shrinkwrap file is %s" % data)
outputurl = "invalid"
- if ('resolved' not in data):
+ if ('resolved' not in data) or (not data['resolved'].startswith('http')):
# will be the case for ${PN}
fetchcmd = "npm view %s@%s dist.tarball --registry %s" % (pkg, version, ud.registry)
logger.debug(2, "Found this matching URL: %s" % str(fetchcmd))
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list