diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2013-10-17 12:42:19 +0100 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-10-17 12:42:19 +0100 |
| commit | 53e83cc89dce3434b7b62505ae5a1e359b124267 (patch) | |
| tree | 5b4b4fffeaa04358ee5b7f4c707e564c55ab6c4b | |
| parent | 7a11ffef90359abf7907fbe6d6afd153fb4ed745 (diff) | |
| parent | bd6ef795d713edf0beeaee509a095239be943366 (diff) | |
| download | morph-53e83cc89dce3434b7b62505ae5a1e359b124267.tar.gz | |
Merge branch 'baserock/richardmaw/bugfix/null-build-without-push' of git://git.baserock.org/baserock/baserock/morph
Reviewed-by: Lars Wirzenius
Reviewed-by: Richard Ipsum
| -rw-r--r-- | morphlib/plugins/branch_and_merge_plugin.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index fec16415..990fe100 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -1638,7 +1638,7 @@ class BranchAndMergePlugin(cliapp.Plugin): } def add_morphology_info(info, category): - repo = info['repo'] + repo = info['repo'] or branch_root if repo in build_repos: repo_dir = build_repos[repo]['dirname'] else: @@ -1658,7 +1658,7 @@ class BranchAndMergePlugin(cliapp.Plugin): # building this system from the system branch. system_morphology = self.load_morphology(branch_root_dir, system_name) for info in system_morphology['strata']: - if info['ref'] == system_branch: + if info['ref'] == system_branch or info['ref'] is None: repo_dir = add_morphology_info(info, 'strata') if repo_dir: stratum_morphology = self.load_morphology( |