From 0523378082e9a3857808bdb2a8a5df05aade8b20 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 21 Mar 2016 18:14:05 +1300 Subject: devtool: add: create git repository if URL specified as positional argument When we add from a fetched URL we are supposed to turn the resulting source tree into a git repository (if it isn't already one). However, we were using the older deprecated option name here instead of the positional argument, so "devtool add -f " resulted in the repo being created but "devtool add " didn't, which was wrong. Also update the oe-selftest tests to check that this worked. (From OE-Core rev: a7b6b1f8cc1c096724f794ac9dee312b0f771f66) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/devtool.py | 2 ++ scripts/lib/devtool/standard.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py index 2e4b6dada3..fe9f7f77a4 100644 --- a/meta/lib/oeqa/selftest/devtool.py +++ b/meta/lib/oeqa/selftest/devtool.py @@ -301,6 +301,7 @@ class DevtoolTests(DevtoolBase): result = runCmd('devtool add %s %s -f %s' % (testrecipe, srcdir, url)) self.assertTrue(os.path.exists(os.path.join(self.workspacedir, 'conf', 'layer.conf')), 'Workspace directory not created. %s' % result.output) self.assertTrue(os.path.isfile(os.path.join(srcdir, 'setup.py')), 'Unable to find setup.py in source directory') + self.assertTrue(os.path.isdir(os.path.join(srcdir, '.git')), 'git repository for external source tree was not created') # Test devtool status result = runCmd('devtool status') self.assertIn(testrecipe, result.output) @@ -394,6 +395,7 @@ class DevtoolTests(DevtoolBase): result = runCmd('devtool add %s' % url) self.assertTrue(os.path.exists(os.path.join(self.workspacedir, 'conf', 'layer.conf')), 'Workspace directory not created. %s' % result.output) self.assertTrue(os.path.isfile(os.path.join(srcdir, 'configure')), 'Unable to find configure script in source directory') + self.assertTrue(os.path.isdir(os.path.join(srcdir, '.git')), 'git repository for external source tree was not created') # Test devtool status result = runCmd('devtool status') self.assertIn(testrecipe, result.output) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 9ac2ad57a8..f3f3e98d2f 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -205,7 +205,7 @@ def add(args, config, basepath, workspace): for fn in os.listdir(recipedir): _add_md5(config, recipename, os.path.join(recipedir, fn)) - if args.fetch and not args.no_git: + if args.fetchuri and not args.no_git: setup_git_repo(srctree, args.version, 'devtool') initial_rev = None -- cgit v1.2.3-54-g00ecf