diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-03-27 16:10:32 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-03-27 16:10:53 +0000 |
| commit | 05227f59f5a24393a057e7c6d7ef04fafb53b7bc (patch) | |
| tree | 9c15d9facc52175ed2e71246952d1d965b81058a /morphlib/plugins/deploy_plugin.py | |
| parent | f382fbd58bdbe4b20dbe62272e2444933869d4b7 (diff) | |
| download | morph-05227f59f5a24393a057e7c6d7ef04fafb53b7bc.tar.gz | |
Bug fix: use the right directory for the system morphology
Previously we used the system branch top directory, when we need
the directory where the git repo for the system morphology is
checked out.
Diffstat (limited to 'morphlib/plugins/deploy_plugin.py')
| -rw-r--r-- | morphlib/plugins/deploy_plugin.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/morphlib/plugins/deploy_plugin.py b/morphlib/plugins/deploy_plugin.py index f8fe0300..2b761240 100644 --- a/morphlib/plugins/deploy_plugin.py +++ b/morphlib/plugins/deploy_plugin.py @@ -78,6 +78,10 @@ class DeployPlugin(cliapp.Plugin): 'building %(system)s from %(branch)s', system=system_name, branch=branch) + # Find system branch root repository on the local disk. + root_repo = self.other.get_branch_config(branch_dir, 'branch.root') + root_repo_dir = self.other.find_repository(branch_dir, root_repo) + # Get repositories of morphologies involved in building this system # from the current system branch. build_repos = self.other.get_system_build_repos( @@ -142,7 +146,7 @@ class DeployPlugin(cliapp.Plugin): names = artifact.source.morphology['configuration-extensions'] for name in names: self._run_extension( - branch_dir, + root_repo_dir, build_ref, name, '.configure', @@ -152,7 +156,7 @@ class DeployPlugin(cliapp.Plugin): # Run write extension. self.app.status(msg='Writing to device') self._run_extension( - branch_dir, + root_repo_dir, build_ref, deployment_type, '.write', |