mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-13 09:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

scripts/oe-git-archive: fix non-existent key referencing error

Browse Source 
Without installing gitpython package, oe-git-archive will face error
below, where it was referencing key that was non-existent inside
metadata object.

Traceback (most recent call last):
  File "<poky_dir>/scripts/oe-git-archive", line 271, in <module>
    sys.exit(main())
  File "<poky_dir>/scripts/oe-git-archive", line 229, in main
    'commit_count': metadata['layers']['meta']['commit_count'],
KeyError: 'commit_count'

Fix this error by adding exception catch when referencing
non-existent key (based on inputs provided by Richard Purdie).

[YOCTO# 13082]

(From OE-Core rev: 9a3cc9b8523b78dda6c3f3f2e12798b2b907d7e5)

Signed-off-by: Yeoh Ee Peng <ee.peng.yeoh@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Yeoh Ee Peng
2019-01-04 14:46:01 +08:00
committed by Richard Purdie
parent a9b1f9eca9
commit 71a1c1119b
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/oe-git-archive
View File

@@ -1,4 +1,4 @@
#!/usr/bin/python3 #!/usr/bin/env python3
# #
# Helper script for committing data to git and pushing upstream # Helper script for committing data to git and pushing upstream
# #
@@ -208,6 +208,13 @@ def parse_args(argv):
help="Data to commit") help="Data to commit")
return parser.parse_args(argv) return parser.parse_args(argv)
def get_nested(d, list_of_keys):
try:
for k in list_of_keys:
d = d[k]
return d
except KeyError:
return ""
def main(argv=None): def main(argv=None):
"""Script entry point""" """Script entry point"""
@@ -223,11 +230,11 @@ def main(argv=None):
# Get keywords to be used in tag and branch names and messages # Get keywords to be used in tag and branch names and messages
metadata = metadata_from_bb() metadata = metadata_from_bb()
keywords = {'hostname': metadata['hostname'], keywords = {'hostname': get_nested(metadata, ['hostname']),
'branch': metadata['layers']['meta']['branch'], 'branch': get_nested(metadata, ['layers', 'meta', 'branch']),
'commit': metadata['layers']['meta']['commit'], 'commit': get_nested(metadata, ['layers', 'meta', 'commit']),
'commit_count': metadata['layers']['meta']['commit_count'], 'commit_count': get_nested(metadata, ['layers', 'meta', 'commit_count']),
'machine': metadata['config']['MACHINE']} 'machine': get_nested(metadata, ['config', 'MACHINE'])}
# Expand strings early in order to avoid getting into inconsistent # Expand strings early in order to avoid getting into inconsistent
# state (e.g. no tag even if data was committed) # state (e.g. no tag even if data was committed)