summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/lib/bb/fetch2/npm.py19
1 files changed, 5 insertions, 14 deletions
diff --git a/bitbake/lib/bb/fetch2/npm.py b/bitbake/lib/bb/fetch2/npm.py
index f08bdee739..4427b1bb87 100644
--- a/bitbake/lib/bb/fetch2/npm.py
+++ b/bitbake/lib/bb/fetch2/npm.py
@@ -151,20 +151,11 @@ class Npm(FetchMethod):
151 Parse the output of npm view --json; the last JSON result 151 Parse the output of npm view --json; the last JSON result
152 is assumed to be the one that we're interested in. 152 is assumed to be the one that we're interested in.
153 ''' 153 '''
154 pdata = None 154 pdata = json.loads(output);
155 outdeps = {} 155 try:
156 datalines = [] 156 return pdata[-1]
157 bracelevel = 0 157 except:
158 for line in output.splitlines(): 158 return pdata
159 if bracelevel:
160 datalines.append(line)
161 elif '{' in line:
162 datalines = []
163 datalines.append(line)
164 bracelevel = bracelevel + line.count('{') - line.count('}')
165 if datalines:
166 pdata = json.loads('\n'.join(datalines))
167 return pdata
168 159
169 def _getdependencies(self, pkg, data, version, d, ud, optional=False, fetchedlist=None): 160 def _getdependencies(self, pkg, data, version, d, ud, optional=False, fetchedlist=None):
170 if fetchedlist is None: 161 if fetchedlist is None: