diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-06-18 16:56:51 +0100 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-06-22 13:12:18 +0000 |
| commit | 26dce1d6ef83294c184fc513232130dbbd8f19dc (patch) | |
| tree | 371807748eead8c8f31cd5cbe3af40fccb597f59 /morphlib/plugins | |
| parent | 9dfed63d574ad68e7a22c98ef9aac1f2a3bd172b (diff) | |
| download | morph-26dce1d6ef83294c184fc513232130dbbd8f19dc.tar.gz | |
Determine whether to include_local_changes from app.settings
Previously callers to DefinitionsRepoWithApp.source_pool() could
override the user's value, but that's not actually used anywhere.
Change-Id: I43b53e7b9fc937886c8e6e95947e5e2b6776d085
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, |