diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-03-09 17:22:12 +1300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-09 22:45:16 +0000 |
| commit | ef6a4518e402c676a1de21990f1decd673c4cace (patch) | |
| tree | 7bdba09242ee5b3f6167bc41fd25f83f21d8e76d | |
| parent | ad50ce907a130394c33b789161ec384455fd709e (diff) | |
| download | poky-ef6a4518e402c676a1de21990f1decd673c4cace.tar.gz | |
bitbake: fetch2/npm: fix errors with some version specifications
"2 || 3" is a valid version specification for a dependency in an npm
package.json file, but of course that looks like something else when
sent to a shell. Quote the version value to avoid this.
(Bitbake rev: bea0246831a46d943d2e27d6b38f6e498bd3413c)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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 457043f304..df27669c58 100644 --- a/bitbake/lib/bb/fetch2/npm.py +++ b/bitbake/lib/bb/fetch2/npm.py | |||
| @@ -145,7 +145,7 @@ class Npm(FetchMethod): | |||
| 145 | def _getdependencies(self, pkg, data, version, d, ud): | 145 | def _getdependencies(self, pkg, data, version, d, ud): |
| 146 | pkgfullname = pkg | 146 | pkgfullname = pkg |
| 147 | if version != '*' and not '/' in version: | 147 | if version != '*' and not '/' in version: |
| 148 | pkgfullname += "@%s" % version | 148 | pkgfullname += "@'%s'" % version |
| 149 | logger.debug(2, "Calling getdeps on %s" % pkg) | 149 | logger.debug(2, "Calling getdeps on %s" % pkg) |
| 150 | fetchcmd = "npm view %s dist.tarball --registry %s" % (pkgfullname, ud.registry) | 150 | fetchcmd = "npm view %s dist.tarball --registry %s" % (pkgfullname, ud.registry) |
| 151 | output = runfetchcmd(fetchcmd, d, True) | 151 | output = runfetchcmd(fetchcmd, d, True) |
