diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2014-02-14 10:22:46 +0000 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-02-14 10:22:46 +0000 |
commit | 8f8fc96b884e7f175d4a01bc2d91452d7149bf33 (patch) | |
tree | d0d19252c154fb030f7dfa1c4784ef60e45bc40e /morphlib/artifactresolver.py | |
parent | 2decdcdd27567e99e3bc53347d34064ab34f7932 (diff) | |
parent | fbf70e2e5595d0cc7edaf7240a732cc5d2632c34 (diff) | |
download | morph-8f8fc96b884e7f175d4a01bc2d91452d7149bf33.tar.gz |
Merge branch 'baserock/richardmaw/S10310/invalid-repo-ref-v2'
Reviewed-by: Sam Thursfield
Diffstat (limited to 'morphlib/artifactresolver.py')
-rw-r--r-- | morphlib/artifactresolver.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/morphlib/artifactresolver.py b/morphlib/artifactresolver.py index ae0cfcf5..00976eb7 100644 --- a/morphlib/artifactresolver.py +++ b/morphlib/artifactresolver.py @@ -140,8 +140,8 @@ class ArtifactResolver(object): for info in source.morphology['strata']: stratum_source = self._source_pool.lookup( - info['repo'] or source.repo_name, - info['ref'] or source.original_ref, + info.get('repo') or source.repo_name, + info.get('ref') or source.original_ref, '%s.morph' % info['morph']) stratum_name = stratum_source.morphology['name'] @@ -165,8 +165,8 @@ class ArtifactResolver(object): for stratum_info in source.morphology.get('build-depends') or []: other_source = self._source_pool.lookup( - stratum_info['repo'] or source.repo_name, - stratum_info['ref'] or source.original_ref, + stratum_info.get('repo') or source.repo_name, + stratum_info.get('ref') or source.original_ref, '%s.morph' % stratum_info['morph']) # Make every stratum artifact this stratum source produces |