diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-10-11 16:13:18 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-01 21:32:03 +0000 |
commit | 0fe742674e9a37e7b352065a1b524d37e5a41137 (patch) | |
tree | bfaeb9311380e3598fe9a1b083b3d44a67a6c1fb /scripts/devtool | |
parent | a360fa7d519320faf53065ba9584a426fd275c1a (diff) | |
download | poky-0fe742674e9a37e7b352065a1b524d37e5a41137.tar.gz |
devtool: disable creating workspace for extract and search subcommands
For subcommands that don't actually involve the workspace, don't
auto-create the workspace.
(From OE-Core rev: 90cba7992bc1d227e242666cd486414bd4a45f7e)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/devtool')
-rwxr-xr-x | scripts/devtool | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/devtool b/scripts/devtool index e4d9db301a..2a5a3d41c1 100755 --- a/scripts/devtool +++ b/scripts/devtool | |||
@@ -261,7 +261,7 @@ def main(): | |||
261 | description='Sets up a new workspace. NOTE: other devtool subcommands will create a workspace automatically as needed, so you only need to use %(prog)s if you want to specify where the workspace should be located.') | 261 | description='Sets up a new workspace. NOTE: other devtool subcommands will create a workspace automatically as needed, so you only need to use %(prog)s if you want to specify where the workspace should be located.') |
262 | parser_create_workspace.add_argument('layerpath', nargs='?', help='Path in which the workspace layer should be created') | 262 | parser_create_workspace.add_argument('layerpath', nargs='?', help='Path in which the workspace layer should be created') |
263 | parser_create_workspace.add_argument('--create-only', action="store_true", help='Only create the workspace layer, do not alter configuration') | 263 | parser_create_workspace.add_argument('--create-only', action="store_true", help='Only create the workspace layer, do not alter configuration') |
264 | parser_create_workspace.set_defaults(func=create_workspace) | 264 | parser_create_workspace.set_defaults(func=create_workspace, no_workspace=True) |
265 | 265 | ||
266 | for plugin in plugins: | 266 | for plugin in plugins: |
267 | if hasattr(plugin, 'register_commands'): | 267 | if hasattr(plugin, 'register_commands'): |
@@ -269,7 +269,7 @@ def main(): | |||
269 | 269 | ||
270 | args = parser.parse_args(unparsed_args, namespace=global_args) | 270 | args = parser.parse_args(unparsed_args, namespace=global_args) |
271 | 271 | ||
272 | if args.subparser_name != 'create-workspace': | 272 | if not getattr(args, 'no_workspace', False): |
273 | read_workspace() | 273 | read_workspace() |
274 | 274 | ||
275 | try: | 275 | try: |