diff options
Diffstat (limited to 'morphlib/plugins')
| -rw-r--r-- | morphlib/plugins/build_plugin.py | 4 | ||||
| -rw-r--r-- | morphlib/plugins/deploy_plugin.py | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/morphlib/plugins/build_plugin.py b/morphlib/plugins/build_plugin.py index c1fa64a7..0e695691 100644 --- a/morphlib/plugins/build_plugin.py +++ b/morphlib/plugins/build_plugin.py @@ -286,10 +286,8 @@ class BuildPlugin(cliapp.Plugin): self.app.settings['cachedir'], self.app.settings['cachedir-min-space']) - local_changes = self.app.settings['local-changes'] source_pool_context = definitions_repo.source_pool( - definitions_repo.HEAD, filename, - include_local_changes=(local_changes == 'include')) + definitions_repo.HEAD, filename) with source_pool_context as source_pool: self._build(source_pool, filename, component_names=component_names) diff --git a/morphlib/plugins/deploy_plugin.py b/morphlib/plugins/deploy_plugin.py index d3c61bf0..89b88373 100644 --- a/morphlib/plugins/deploy_plugin.py +++ b/morphlib/plugins/deploy_plugin.py @@ -452,12 +452,10 @@ class DeployPlugin(cliapp.Plugin): # temporary branch, for each system and subsystem being deployed. # We could do a much better job if a source pool could contain # multiple systems of different architectures. - include_local_changes = (self.app.settings['local-changes']=='include') morph = morphlib.util.sanitise_morphology_path(system['morph']) source_pool_context = definitions_repo.source_pool( - definitions_repo.HEAD, morph, - include_local_changes=include_local_changes) + definitions_repo.HEAD, morph) with source_pool_context as source_pool: self.deploy_system_with_source_pool( deploy_tempdir, definitions_repo, source_pool, system, |