diff options
Diffstat (limited to 'scripts/lib/devtool/standard.py')
-rw-r--r-- | scripts/lib/devtool/standard.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 73e629ca6f..1e84ae413f 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
@@ -155,11 +155,14 @@ def add(args, config, basepath, workspace): | |||
155 | 155 | ||
156 | tempdir = tempfile.mkdtemp(prefix='devtool') | 156 | tempdir = tempfile.mkdtemp(prefix='devtool') |
157 | try: | 157 | try: |
158 | builtnpm = False | ||
158 | while True: | 159 | while True: |
159 | try: | 160 | try: |
160 | stdout, _ = exec_build_env_command(config.init_path, basepath, 'recipetool --color=%s create --devtool -o %s \'%s\' %s' % (color, tempdir, source, extracmdopts), watch=True) | 161 | stdout, _ = exec_build_env_command(config.init_path, basepath, 'recipetool --color=%s create --devtool -o %s \'%s\' %s' % (color, tempdir, source, extracmdopts), watch=True) |
161 | except bb.process.ExecutionError as e: | 162 | except bb.process.ExecutionError as e: |
162 | if e.exitcode == 14: | 163 | if e.exitcode == 14: |
164 | if builtnpm: | ||
165 | raise DevtoolError('Re-running recipetool still failed to find npm') | ||
163 | # FIXME this is a horrible hack that is unfortunately | 166 | # FIXME this is a horrible hack that is unfortunately |
164 | # necessary due to the fact that we can't run bitbake from | 167 | # necessary due to the fact that we can't run bitbake from |
165 | # inside recipetool since recipetool keeps tinfoil active | 168 | # inside recipetool since recipetool keeps tinfoil active |
@@ -167,6 +170,7 @@ def add(args, config, basepath, workspace): | |||
167 | # to exit out and come back here to do it. | 170 | # to exit out and come back here to do it. |
168 | ensure_npm(config, basepath, args.fixed_setup, check_exists=False) | 171 | ensure_npm(config, basepath, args.fixed_setup, check_exists=False) |
169 | logger.info('Re-running recipe creation process after building nodejs') | 172 | logger.info('Re-running recipe creation process after building nodejs') |
173 | builtnpm = True | ||
170 | continue | 174 | continue |
171 | elif e.exitcode == 15: | 175 | elif e.exitcode == 15: |
172 | raise DevtoolError('Could not auto-determine recipe name, please specify it on the command line') | 176 | raise DevtoolError('Could not auto-determine recipe name, please specify it on the command line') |