mirror of
https://git.yoctoproject.org/poky
synced 2026-04-22 15:32:14 +02:00
npm: take 'version' directly from 'package.json'
We know the content of 'package.json' from earlier patches; there is no need to parse the tarball name to extract the version. (From OE-Core rev: f553e528e76f7e3925ed1c0950d96e73aec37da9) Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
3a4c11f2c7
commit
2c9c9641bf
@@ -126,11 +126,6 @@ python npm_do_configure() {
|
||||
sha512 = bb.utils.sha512_file(tarball)
|
||||
return "sha512-" + base64.b64encode(bytes.fromhex(sha512)).decode()
|
||||
|
||||
def _npm_version(tarball):
|
||||
"""Return the version of a specified tarball"""
|
||||
regex = r"-(\d+\.\d+\.\d+(-.*)?(\+.*)?)\.tgz"
|
||||
return re.search(regex, tarball).group(1)
|
||||
|
||||
def _npmsw_dependency_dict(orig, deptree):
|
||||
"""
|
||||
Return the sub dictionary in the 'orig' dictionary corresponding to the
|
||||
@@ -191,7 +186,7 @@ python npm_do_configure() {
|
||||
_npm_cache_add(tarball)
|
||||
# Add its signature to the cached shrinkwrap
|
||||
dep = _npmsw_dependency_dict(cached_shrinkwrap, deptree)
|
||||
dep["version"] = _npm_version(tarball)
|
||||
dep["version"] = pkg['version']
|
||||
dep["integrity"] = _npm_integrity(tarball)
|
||||
if params.get("dev", False):
|
||||
dep["dev"] = True
|
||||
|
||||
Reference in New Issue
Block a user