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/buildcommand.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/buildcommand.py')
| -rw-r--r-- | morphlib/buildcommand.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/morphlib/buildcommand.py b/morphlib/buildcommand.py index 6485f510..137c63b4 100644 --- a/morphlib/buildcommand.py +++ b/morphlib/buildcommand.py @@ -228,8 +228,8 @@ class BuildCommand(object): def _validate_cross_refs_for_xxx(self, src, srcpool, specs, wanted): for spec in specs: - repo_name = spec['repo'] or src.repo_name - ref = spec['ref'] or src.original_ref + repo_name = spec.get('repo') or src.repo_name + ref = spec.get('ref') or src.original_ref filename = '%s.morph' % spec['morph'] logging.debug( 'Validating cross ref to %s:%s:%s' % |