diff options
| author |   Mark Hatle <mark.hatle@windriver.com> | 2019-01-26 20:04:23 -0500 |
|---|---|---|
| committer | Mark Hatle <mark.hatle@windriver.com> | 2019-01-26 20:18:02 -0500 |
| commit | ce5bb0056e6c510855811a26afb95073daf90f2a (patch) | |
| tree | 14118d70681646b4ae55d8abdfcbf39903bccb88 /lib/bb/fetch2/gitsm.py | |
| parent | 8c8ecec2a722bc2885e2648d41ac8df07bdf660d (diff) | |
| download | bitbake-contrib-ce5bb0056e6c510855811a26afb95073daf90f2a.tar.gz | |
gitsm: The fetcher did not process some recursive submodules properly.mgh/gitsm
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>
Diffstat (limited to 'lib/bb/fetch2/gitsm.py')
| -rw-r--r-- | lib/bb/fetch2/gitsm.py | 4 |
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) |