diff options
| author |   Joshua Lock <joshua.g.lock@intel.com> | 2016-11-23 13:22:02 +0000 |
|---|---|---|
| committer | Joshua Lock <joshua.g.lock@intel.com> | 2016-12-05 15:36:27 +0000 |
| commit | 65250a5537da220dff662269cb81d086b66c2ace (patch) | |
| tree | c0b1fc6c9e8471346c416b964eff583f51d26589 /scripts/lib/recipetool/create_npm.py | |
| parent | 11063a01d4511b2688ea7ba2d7359e4e07328c66 (diff) | |
| download | openembedded-core-contrib-65250a5537da220dff662269cb81d086b66c2ace.tar.gz | |
meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Diffstat (limited to 'scripts/lib/recipetool/create_npm.py')
| -rw-r--r-- | scripts/lib/recipetool/create_npm.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/lib/recipetool/create_npm.py b/scripts/lib/recipetool/create_npm.py index 7bb844cb0c..888aa2b00a 100644 --- a/scripts/lib/recipetool/create_npm.py +++ b/scripts/lib/recipetool/create_npm.py @@ -49,7 +49,7 @@ class NpmRecipeHandler(RecipeHandler): def _shrinkwrap(self, srctree, localfilesdir, extravalues, lines_before): try: - runenv = dict(os.environ, PATH=tinfoil.config_data.getVar('PATH', True)) + runenv = dict(os.environ, PATH=tinfoil.config_data.getVar('PATH')) bb.process.run('npm shrinkwrap', cwd=srctree, stderr=subprocess.STDOUT, env=runenv, shell=True) except bb.process.ExecutionError as e: logger.warn('npm shrinkwrap failed:\n%s' % e.stdout) @@ -62,7 +62,7 @@ class NpmRecipeHandler(RecipeHandler): lines_before.append('NPM_SHRINKWRAP := "${THISDIR}/${PN}/npm-shrinkwrap.json"') def _lockdown(self, srctree, localfilesdir, extravalues, lines_before): - runenv = dict(os.environ, PATH=tinfoil.config_data.getVar('PATH', True)) + runenv = dict(os.environ, PATH=tinfoil.config_data.getVar('PATH')) if not NpmRecipeHandler.lockdownpath: NpmRecipeHandler.lockdownpath = tempfile.mkdtemp('recipetool-npm-lockdown') bb.process.run('npm install lockdown --prefix %s' % NpmRecipeHandler.lockdownpath, @@ -257,7 +257,7 @@ class NpmRecipeHandler(RecipeHandler): if version != '*' and not '/' in version: pkgfullname += "@'%s'" % version logger.debug(2, "Calling getdeps on %s" % pkg) - runenv = dict(os.environ, PATH=d.getVar('PATH', True)) + runenv = dict(os.environ, PATH=d.getVar('PATH')) fetchcmd = "npm view %s --json" % pkgfullname output, _ = bb.process.run(fetchcmd, stderr=subprocess.STDOUT, env=runenv, shell=True) data = self._parse_view(output) |