summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-11-11 10:41:24 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-11-11 10:43:09 +0000
commitd559d36233b7661dd60e374cf9582be736e9787d (patch)
tree4c57f74c7fc5941531f1c6cafc24da4a4351b4ed
parentdb759870b43782bf86801a6b55d14af24445b121 (diff)
downloadmorph-d559d36233b7661dd60e374cf9582be736e9787d.tar.gz
Allow `morph deploy` to cache missing Git repos if it needs to
This reverts commit c63f4e61f69820c71c2d8e9b96ce9bdec0d476a1. This change was introduced back when the Baserock system definitions used named Git refs rather than exact SHA1s. Morph would thus need to update each repo involved in a build and resolve each ref before it could build. Now that the system definitions use SHA1s, the 'updating gits' phase is much less slow. The problem with forcing 'no-git-update' is that it makes `morph deploy` depend on the remote repo cache. In the case that all repos involved in the build are avaiable in the remote repo cache (Trove), there is no need for them to have been cached locally just to construct a build graph. But if the network connection to the Trove is unreliable Morph will need to fall back to the local repo cache. Unless Morph has done a full local build of the system being built, it might not have every repo cached locally. Often, cached artifacts from the Trove or distbuild may be used instead of locally building everything. In this case the user sees `morph deploy` failing with errors such as: Repository upstream:binutils-redhat is not cached yet
-rw-r--r--morphlib/plugins/deploy_plugin.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/morphlib/plugins/deploy_plugin.py b/morphlib/plugins/deploy_plugin.py
index e795e637..dd0ba903 100644
--- a/morphlib/plugins/deploy_plugin.py
+++ b/morphlib/plugins/deploy_plugin.py
@@ -281,7 +281,6 @@ class DeployPlugin(cliapp.Plugin):
self.app.settings['tempdir-min-space'],
'/', 0)
- self.app.settings['no-git-update'] = True
cluster_filename = morphlib.util.sanitise_morphology_path(args[0])
ws = morphlib.workspace.open('.')