diff options
Diffstat (limited to 'scripts/devtool')
-rwxr-xr-x | scripts/devtool | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/scripts/devtool b/scripts/devtool index b1274d69d8..91e3954dbb 100755 --- a/scripts/devtool +++ b/scripts/devtool | |||
@@ -289,17 +289,15 @@ def main(): | |||
289 | 289 | ||
290 | if global_args.bbpath is None: | 290 | if global_args.bbpath is None: |
291 | tinfoil = setup_tinfoil(config_only=True, basepath=basepath) | 291 | tinfoil = setup_tinfoil(config_only=True, basepath=basepath) |
292 | global_args.bbpath = tinfoil.config_data.getVar('BBPATH', True) | 292 | try: |
293 | else: | 293 | global_args.bbpath = tinfoil.config_data.getVar('BBPATH', True) |
294 | tinfoil = None | 294 | finally: |
295 | tinfoil.shutdown() | ||
295 | 296 | ||
296 | for path in [scripts_path] + global_args.bbpath.split(':'): | 297 | for path in [scripts_path] + global_args.bbpath.split(':'): |
297 | pluginpath = os.path.join(path, 'lib', 'devtool') | 298 | pluginpath = os.path.join(path, 'lib', 'devtool') |
298 | scriptutils.load_plugins(logger, plugins, pluginpath) | 299 | scriptutils.load_plugins(logger, plugins, pluginpath) |
299 | 300 | ||
300 | if tinfoil: | ||
301 | tinfoil.shutdown() | ||
302 | |||
303 | subparsers = parser.add_subparsers(dest="subparser_name", title='subcommands', metavar='<subcommand>') | 301 | subparsers = parser.add_subparsers(dest="subparser_name", title='subcommands', metavar='<subcommand>') |
304 | subparsers.required = True | 302 | subparsers.required = True |
305 | 303 | ||