[oe-commits] [bitbake] 01/07: fetch2/npm: fix errors with some version specifications

git at git.openembedded.org git at git.openembedded.org
Wed Mar 9 22:46:13 UTC 2016


rpurdie pushed a commit to branch master
in repository bitbake.

commit bea0246831a46d943d2e27d6b38f6e498bd3413c
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Wed Mar 9 17:22:12 2016 +1300

    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.
    
    Signed-off-by: Paul Eggleton <paul.eggleton at linux.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 457043f..df27669 100644
--- a/lib/bb/fetch2/npm.py
+++ b/lib/bb/fetch2/npm.py
@@ -145,7 +145,7 @@ class Npm(FetchMethod):
     def _getdependencies(self, pkg, data, version, d, ud):
         pkgfullname = pkg
         if version != '*' and not '/' in version:
-            pkgfullname += "@%s" % version
+            pkgfullname += "@'%s'" % version
         logger.debug(2, "Calling getdeps on %s" % pkg)
         fetchcmd = "npm view %s dist.tarball --registry %s" % (pkgfullname, ud.registry)
         output = runfetchcmd(fetchcmd, d, True)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list