From f034379238f980a8c5ec4295288448eab2a3d015 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 18 Nov 2020 10:42:21 -0600 Subject: Revert "Revert "poky: subtree update:b23aa6b753..ad30a6d470"" This reverts commit 4873add6e11c1bd421c83cd08df589f1184aa673. A fix has been put up for openbmc/openbmc#3720 so we can bring this back now Signed-off-by: Andrew Geissler Change-Id: If59020a5b502f70aa7149fbef4ad2f50824d1ce6 --- poky/scripts/oe-build-perf-report | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'poky/scripts/oe-build-perf-report') diff --git a/poky/scripts/oe-build-perf-report b/poky/scripts/oe-build-perf-report index 7ed86a72f..7812ea454 100755 --- a/poky/scripts/oe-build-perf-report +++ b/poky/scripts/oe-build-perf-report @@ -353,7 +353,7 @@ def print_html_report(data, id_comp, buildstats): bs_key = test + '.' + meas rev = str(metadata['commit_num']['value']) comp_rev = str(metadata['commit_num']['value_old']) - if (rev in buildstats and bs_key in buildstats[rev] and + if (buildstats and rev in buildstats and bs_key in buildstats[rev] and comp_rev in buildstats and bs_key in buildstats[comp_rev]): new_meas['buildstats'] = BSSummary(buildstats[comp_rev][bs_key], buildstats[rev][bs_key]) @@ -509,7 +509,7 @@ def main(argv=None): revs = gitarchive.get_test_revs(log, repo, args.tag_name, hostname=args.hostname, branch=args.branch, machine=args.machine) - if args.branch2: + if args.branch2 and args.branch2 != args.branch: revs2 = gitarchive.get_test_revs(log, repo, args.tag_name, hostname=args.hostname, branch=args.branch2, machine=args.machine) if not len(revs2): @@ -533,7 +533,7 @@ def main(argv=None): else: index1 = len(revs) - 1 - if args.branch2: + if args.branch2 and args.branch2 != args.branch: revs2.append(revs[index1]) index1 = len(revs2) - 1 revs = revs2 -- cgit v1.2.3