summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2017-02-02 13:48:57 (GMT)
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2017-02-09 17:55:36 (GMT)
commit95deb4a04c57d64c71129d78d4b1a9638c6bab1c (patch)
treef54ad457708451a00e6784fc62a88f387199cfb2
parentd594c56ee1f253bfb7a599ac340957099ea73d94 (diff)
downloaddefinitions-95deb4a04c57d64c71129d78d4b1a9638c6bab1c.tar.gz
scriptslib: Update 'import_meta_ybd' for current YBD
Now the strip-gplv3 configure extension works again when using YBD metadata.
-rw-r--r--scripts/scriptslib.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/scriptslib.py b/scripts/scriptslib.py
index 1f79fb9..53c6ca8 100644
--- a/scripts/scriptslib.py
+++ b/scripts/scriptslib.py
@@ -88,14 +88,17 @@ class BaserockMeta(object):
null = '0' * 32
- if 'repo' not in source:
+ if 'configuration' in source:
+ # This is the deployment metadata, ignore
+ return
+ elif 'repo' not in source:
kind = 'stratum'
contents = 'components'
source['repo'] = 'upstream:definitions'
source['ref'] = null # No ref info
else:
kind = 'chunk'
- contents = 'files'
+ contents = 'components'
repo = parse_repo_alias(source['repo'])
source_name = '-'.join(