summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/oe-git-archive19
1 files changed, 13 insertions, 6 deletions
diff --git a/scripts/oe-git-archive b/scripts/oe-git-archive
index ab19cb9aa3..913291a99c 100755
--- a/scripts/oe-git-archive
+++ b/scripts/oe-git-archive
@@ -1,4 +1,4 @@
1#!/usr/bin/python3 1#!/usr/bin/env python3
2# 2#
3# Helper script for committing data to git and pushing upstream 3# Helper script for committing data to git and pushing upstream
4# 4#
@@ -208,6 +208,13 @@ def parse_args(argv):
208 help="Data to commit") 208 help="Data to commit")
209 return parser.parse_args(argv) 209 return parser.parse_args(argv)
210 210
211def get_nested(d, list_of_keys):
212 try:
213 for k in list_of_keys:
214 d = d[k]
215 return d
216 except KeyError:
217 return ""
211 218
212def main(argv=None): 219def main(argv=None):
213 """Script entry point""" 220 """Script entry point"""
@@ -223,11 +230,11 @@ def main(argv=None):
223 230
224 # Get keywords to be used in tag and branch names and messages 231 # Get keywords to be used in tag and branch names and messages
225 metadata = metadata_from_bb() 232 metadata = metadata_from_bb()
226 keywords = {'hostname': metadata['hostname'], 233 keywords = {'hostname': get_nested(metadata, ['hostname']),
227 'branch': metadata['layers']['meta']['branch'], 234 'branch': get_nested(metadata, ['layers', 'meta', 'branch']),
228 'commit': metadata['layers']['meta']['commit'], 235 'commit': get_nested(metadata, ['layers', 'meta', 'commit']),
229 'commit_count': metadata['layers']['meta']['commit_count'], 236 'commit_count': get_nested(metadata, ['layers', 'meta', 'commit_count']),
230 'machine': metadata['config']['MACHINE']} 237 'machine': get_nested(metadata, ['config', 'MACHINE'])}
231 238
232 # Expand strings early in order to avoid getting into inconsistent 239 # Expand strings early in order to avoid getting into inconsistent
233 # state (e.g. no tag even if data was committed) 240 # state (e.g. no tag even if data was committed)