diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-08-28 17:20:04 +0100 |
|---|---|---|
| committer | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-08-30 11:19:01 +0000 |
| commit | 2a071ef057c953e81e1b8bd9b714373b4dbb26c2 (patch) | |
| tree | bffd06cb8a9d0c825cdc2274b7b4c55adc07def6 /morphlib/app.py | |
| parent | ecefb2d1936221ccf21cbad6db2fe73cd229f4f5 (diff) | |
| download | morph-2a071ef057c953e81e1b8bd9b714373b4dbb26c2.tar.gz | |
Strata should be referred to with full repo/ref/morph triplets
This removes the requirement that all strata must be in the same
repo as the system morphology.
Both the system "strata" field and the stratum "build-depends" field
are affected.
Diffstat (limited to 'morphlib/app.py')
| -rwxr-xr-x | morphlib/app.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/morphlib/app.py b/morphlib/app.py index 5cb620eb..9135e440 100755 --- a/morphlib/app.py +++ b/morphlib/app.py @@ -238,11 +238,11 @@ class Morph(cliapp.Application): reponame, absref, filename) visit(reponame, ref, filename, absref, morphology) if morphology['kind'] == 'system': - queue.extend((reponame, ref, '%s.morph' % s) + queue.extend((s['repo'], s['ref'], '%s.morph' % s['morph']) for s in morphology['strata']) elif morphology['kind'] == 'stratum': if morphology['build-depends']: - queue.extend((reponame, ref, '%s.morph' % s) + queue.extend((s['repo'], s['ref'], '%s.morph' % s['morph']) for s in morphology['build-depends']) queue.extend((c['repo'], c['ref'], '%s.morph' % c['morph']) for c in morphology['chunks']) |