diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-04-25 16:53:33 +0100 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-04-25 16:53:33 +0100 |
commit | 06cb7c913b04beeb2676ab8cb39d9c84e77c4a27 (patch) | |
tree | 2b5aa3d7c10a896cce7cf5d5dccae386ce240b1b | |
parent | 3be0fb09fc34bfbf473165018beeb3321cfd7b2d (diff) | |
download | morph-06cb7c913b04beeb2676ab8cb39d9c84e77c4a27.tar.gz |
Fix "morph build" when building stuff that uses submodules
-rwxr-xr-x | morph | 5 | ||||
-rw-r--r-- | tests/build-stratum-with-submodules.stdout | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -214,11 +214,14 @@ class Morph(cliapp.Application): needed.append(artifact) logging.debug('cmd_build: cloning/updating cached repos') + done = set() for artifact in needed: artifact.source.repo = lrc.cache_repo( artifact.source.repo_name) if not self.settings['no-git-update']: - artifact.source.repo.update() + self._cache_repo_and_submodules( + lrc, artifact.source.repo.url, artifact.source.sha1, + done) if self.settings['bootstrap']: staging_root = '/' diff --git a/tests/build-stratum-with-submodules.stdout b/tests/build-stratum-with-submodules.stdout new file mode 100644 index 00000000..a5f677f3 --- /dev/null +++ b/tests/build-stratum-with-submodules.stdout @@ -0,0 +1,4 @@ +./ +baserock/ +baserock/parent.meta +baserock/submod-stratum.meta |