From 95deb4a04c57d64c71129d78d4b1a9638c6bab1c Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Thu, 2 Feb 2017 13:48:57 +0000
Subject: scriptslib: Update 'import_meta_ybd' for current YBD

Now the strip-gplv3 configure extension works again
when using YBD metadata.
---
 scripts/scriptslib.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/scriptslib.py b/scripts/scriptslib.py
index 1f79fb95..53c6ca8e 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(
-- 
cgit v1.2.1