diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2013-09-25 16:53:50 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-09-26 11:20:31 +0000 |
| commit | 6a216934edb2423c9aa347329ea029041927a413 (patch) | |
| tree | 770aa37c3104f3396dbad2336dcdb5c5b6d9ee6f /morphlib/artifactresolver.py | |
| parent | 3d93d272079b602aefe5d3bcd660d4a3307f3aad (diff) | |
| download | morph-6a216934edb2423c9aa347329ea029041927a413.tar.gz | |
Allow building with null repo/ref
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 186d5357..17f038a2 100644 --- a/morphlib/artifactresolver.py +++ b/morphlib/artifactresolver.py @@ -155,8 +155,8 @@ class ArtifactResolver(object): for info in source.morphology['strata']: stratum_source = self._source_pool.lookup( - info['repo'], - info['ref'], + info['repo'] or source.repo_name, + info['ref'] or source.original_ref, '%s.morph' % info['morph']) stratum_name = stratum_source.morphology.builds_artifacts[0] @@ -178,8 +178,8 @@ class ArtifactResolver(object): if stratum.source.morphology['build-depends']: for stratum_info in stratum.source.morphology['build-depends']: other_source = self._source_pool.lookup( - stratum_info['repo'], - stratum_info['ref'], + stratum_info['repo'] or stratum.source.repo_name, + stratum_info['ref'] or stratum.source.original_ref, '%s.morph' % stratum_info['morph']) other_stratum = self._get_artifact( |