summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-10-11 16:13:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-01 21:32:03 +0000
commit0fe742674e9a37e7b352065a1b524d37e5a41137 (patch)
treebfaeb9311380e3598fe9a1b083b3d44a67a6c1fb
parenta360fa7d519320faf53065ba9584a426fd275c1a (diff)
downloadpoky-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>
-rw-r--r--meta/lib/oeqa/selftest/devtool.py8
-rwxr-xr-xscripts/devtool4
-rw-r--r--scripts/lib/devtool/search.py2
-rw-r--r--scripts/lib/devtool/standard.py2
4 files changed, 8 insertions, 8 deletions
diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py
index dcdef5a14b..0a44ae71c8 100644
--- a/meta/lib/oeqa/selftest/devtool.py
+++ b/meta/lib/oeqa/selftest/devtool.py
@@ -823,10 +823,10 @@ class DevtoolTests(DevtoolBase):
823 tempdir = tempfile.mkdtemp(prefix='devtoolqa') 823 tempdir = tempfile.mkdtemp(prefix='devtoolqa')
824 # Try devtool extract 824 # Try devtool extract
825 self.track_for_cleanup(tempdir) 825 self.track_for_cleanup(tempdir)
826 self.track_for_cleanup(self.workspacedir)
827 self.add_command_to_tearDown('bitbake-layers remove-layer */workspace')
828 result = runCmd('devtool extract remake %s' % tempdir) 826 result = runCmd('devtool extract remake %s' % tempdir)
829 self.assertTrue(os.path.exists(os.path.join(tempdir, 'Makefile.am')), 'Extracted source could not be found') 827 self.assertTrue(os.path.exists(os.path.join(tempdir, 'Makefile.am')), 'Extracted source could not be found')
828 # devtool extract shouldn't create the workspace
829 self.assertFalse(os.path.exists(self.workspacedir))
830 self._check_src_repo(tempdir) 830 self._check_src_repo(tempdir)
831 831
832 @testcase(1379) 832 @testcase(1379)
@@ -834,10 +834,10 @@ class DevtoolTests(DevtoolBase):
834 tempdir = tempfile.mkdtemp(prefix='devtoolqa') 834 tempdir = tempfile.mkdtemp(prefix='devtoolqa')
835 # Try devtool extract 835 # Try devtool extract
836 self.track_for_cleanup(tempdir) 836 self.track_for_cleanup(tempdir)
837 self.track_for_cleanup(self.workspacedir)
838 self.add_command_to_tearDown('bitbake-layers remove-layer */workspace')
839 result = runCmd('devtool extract virtual/libx11 %s' % tempdir) 837 result = runCmd('devtool extract virtual/libx11 %s' % tempdir)
840 self.assertTrue(os.path.exists(os.path.join(tempdir, 'Makefile.am')), 'Extracted source could not be found') 838 self.assertTrue(os.path.exists(os.path.join(tempdir, 'Makefile.am')), 'Extracted source could not be found')
839 # devtool extract shouldn't create the workspace
840 self.assertFalse(os.path.exists(self.workspacedir))
841 self._check_src_repo(tempdir) 841 self._check_src_repo(tempdir)
842 842
843 @testcase(1168) 843 @testcase(1168)
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:
diff --git a/scripts/lib/devtool/search.py b/scripts/lib/devtool/search.py
index c2f420c33c..1c8eaff49b 100644
--- a/scripts/lib/devtool/search.py
+++ b/scripts/lib/devtool/search.py
@@ -77,4 +77,4 @@ def register_commands(subparsers, context):
77 parser_search = subparsers.add_parser('search', help='Search available recipes', 77 parser_search = subparsers.add_parser('search', help='Search available recipes',
78 description='Searches for available target recipes. Matches on recipe name, package name, description and installed files, and prints the recipe name on match.') 78 description='Searches for available target recipes. Matches on recipe name, package name, description and installed files, and prints the recipe name on match.')
79 parser_search.add_argument('keyword', help='Keyword to search for (regular expression syntax allowed)') 79 parser_search.add_argument('keyword', help='Keyword to search for (regular expression syntax allowed)')
80 parser_search.set_defaults(func=search) 80 parser_search.set_defaults(func=search, no_workspace=True)
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 9fd936f146..6de24eb524 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -1166,7 +1166,7 @@ def register_commands(subparsers, context):
1166 parser_extract.add_argument('srctree', help='Path to where to extract the source tree') 1166 parser_extract.add_argument('srctree', help='Path to where to extract the source tree')
1167 parser_extract.add_argument('--branch', '-b', default="devtool", help='Name for development branch to checkout') 1167 parser_extract.add_argument('--branch', '-b', default="devtool", help='Name for development branch to checkout')
1168 parser_extract.add_argument('--keep-temp', action="store_true", help='Keep temporary directory (for debugging)') 1168 parser_extract.add_argument('--keep-temp', action="store_true", help='Keep temporary directory (for debugging)')
1169 parser_extract.set_defaults(func=extract) 1169 parser_extract.set_defaults(func=extract, no_workspace=True)
1170 1170
1171 parser_sync = subparsers.add_parser('sync', help='Synchronize the source for an existing recipe', 1171 parser_sync = subparsers.add_parser('sync', help='Synchronize the source for an existing recipe',
1172 description='Synchronize the source for an existing recipe', 1172 description='Synchronize the source for an existing recipe',