aboutsummaryrefslogtreecommitdiffstats
path: root/lib/bb/fetch2/gitsm.py
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2019-03-12 18:46:27 -0400
committerArmin Kuster <akuster@mvista.com>2019-03-13 08:05:19 -0700
commit7c1eb51d1e8a4c5f39bf9dddf05fb0b3598da72b (patch)
tree395d88dbaf7f5947bb4c23741ed0faab62c5ad32 /lib/bb/fetch2/gitsm.py
parentacca06d060e49b2441562b4dc94416af9ab8187e (diff)
downloadbitbake-contrib-7c1eb51d1e8a4c5f39bf9dddf05fb0b3598da72b.tar.gz
gitsm: The fetcher did not process some recursive submodules properly.stable/1.40-next
Move the submodule processing outside of the if statement to avoid any optimizations that may happen. Update the test cases to include the additional case, and split the other test cases into individual tests to make it easier to figure out what the failure may be. Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 0ec98c01ae50f95c9c74acf53013ac59e0e72b08) Signed-off-by: Scott Murray <scott.murray@konsulko.com> Signed-off-by: Armin Kuster <akuster@mvista.com>
Diffstat (limited to 'lib/bb/fetch2/gitsm.py')
-rw-r--r--lib/bb/fetch2/gitsm.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/bb/fetch2/gitsm.py b/lib/bb/fetch2/gitsm.py
index f45546b49..b21fed266 100644
--- a/lib/bb/fetch2/gitsm.py
+++ b/lib/bb/fetch2/gitsm.py
@@ -198,6 +198,8 @@ class GitSM(Git):
Git.unpack(self, ud, destdir, d)
- if not ud.bareclone and self.process_submodules(ud, ud.destdir, unpack_submodules, d):
+ ret = self.process_submodules(ud, ud.destdir, unpack_submodules, d)
+
+ if not ud.bareclone and ret:
# Run submodule update, this sets up the directories -- without touching the config
runfetchcmd("%s submodule update --recursive --no-fetch" % (ud.basecmd), d, quiet=True, workdir=ud.destdir)