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 <url>" resulted in the repo being created but "devtool add <url>" 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 <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
11c1d30152
commit
0523378082
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue