diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-07-22 15:55:44 +0100 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-07-22 15:55:44 +0100 |
| commit | 901ffbe0cb7554150b40f5ee40648b338df36eba (patch) | |
| tree | 43ef4512d031383af62433df2578395693fb515b /morphlib/buildcommand.py | |
| parent | 4be1620dca24d539573027831b65ffc040bc1ebb (diff) | |
| parent | fc5bb595b123db557d2b10a8d570d25e14119686 (diff) | |
| download | morph-901ffbe0cb7554150b40f5ee40648b338df36eba.tar.gz | |
Merge branch 'baserock/richardmaw-os/chunks-in-defs-v3'
Reviewed-by: Daniel Silverstone
Reviewed-by: Sam Thursfield
Diffstat (limited to 'morphlib/buildcommand.py')
| -rw-r--r-- | morphlib/buildcommand.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/morphlib/buildcommand.py b/morphlib/buildcommand.py index 45c6ef00..1cb0c4d9 100644 --- a/morphlib/buildcommand.py +++ b/morphlib/buildcommand.py @@ -90,7 +90,7 @@ class BuildCommand(object): ''' self.app.status(msg='Creating source pool', chatty=True) srcpool = self.app.create_source_pool( - self.lrc, self.rrc, (repo_name, ref, filename)) + self.lrc, self.rrc, repo_name, ref, filename) return srcpool @@ -231,7 +231,8 @@ class BuildCommand(object): for spec in specs: repo_name = spec.get('repo') or src.repo_name ref = spec.get('ref') or src.original_ref - filename = morphlib.util.sanitise_morphology_path(spec['morph']) + filename = morphlib.util.sanitise_morphology_path( + spec.get('morph', spec.get('name'))) logging.debug( 'Validating cross ref to %s:%s:%s' % (repo_name, ref, filename)) |