diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2018-07-11 16:56:49 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-18 10:18:41 +0100 |
commit | 0bbb80d3817ee3a21319b0a3b85ef8fb3763b873 (patch) | |
tree | 33322babae1a29432c2734643a0aa41617adb895 /meta | |
parent | 12a3de568900053cc1704edea53afd80b61b9e5c (diff) | |
download | poky-0bbb80d3817ee3a21319b0a3b85ef8fb3763b873.tar.gz |
lib/oe/buildhistory_analysis: drop related field feature
The original idea here was that changes to certain fields might be able
to be explained if there was a change to another field, for example if
RDEPENDS changed it might be because DEPENDS changed. Thus we were
printing this kind of thing out with each change. Unfortunately in
practice this turned out to be noisy and not particularly useful, so we
might as well remove it.
Fixes [YOCTO #7336].
(From OE-Core rev: 8658b3677b9f7cb70806061c41570c709086ef05)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oe/buildhistory_analysis.py | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/meta/lib/oe/buildhistory_analysis.py b/meta/lib/oe/buildhistory_analysis.py index b0365abced..ff7815d7c9 100644 --- a/meta/lib/oe/buildhistory_analysis.py +++ b/meta/lib/oe/buildhistory_analysis.py | |||
@@ -31,13 +31,6 @@ ver_monitor_fields = ['PKGE', 'PKGV', 'PKGR'] | |||
31 | monitor_numeric_threshold = 10 | 31 | monitor_numeric_threshold = 10 |
32 | # Image files to monitor (note that image-info.txt is handled separately) | 32 | # Image files to monitor (note that image-info.txt is handled separately) |
33 | img_monitor_files = ['installed-package-names.txt', 'files-in-image.txt'] | 33 | img_monitor_files = ['installed-package-names.txt', 'files-in-image.txt'] |
34 | # Related context fields for reporting (note: PE, PV & PR are always reported for monitored package fields) | ||
35 | related_fields = {} | ||
36 | related_fields['RDEPENDS'] = ['DEPENDS'] | ||
37 | related_fields['RRECOMMENDS'] = ['DEPENDS'] | ||
38 | related_fields['FILELIST'] = ['FILES'] | ||
39 | related_fields['files-in-image.txt'] = ['installed-package-names.txt', 'USER_CLASSES', 'IMAGE_CLASSES', 'ROOTFS_POSTPROCESS_COMMAND', 'IMAGE_POSTPROCESS_COMMAND'] | ||
40 | related_fields['installed-package-names.txt'] = ['IMAGE_FEATURES', 'IMAGE_LINGUAS', 'IMAGE_INSTALL', 'BAD_RECOMMENDATIONS', 'NO_RECOMMENDATIONS', 'PACKAGE_EXCLUDE'] | ||
41 | 34 | ||
42 | colours = { | 35 | colours = { |
43 | 'colour_default': '', | 36 | 'colour_default': '', |
@@ -67,7 +60,6 @@ class ChangeRecord: | |||
67 | self.oldvalue = oldvalue | 60 | self.oldvalue = oldvalue |
68 | self.newvalue = newvalue | 61 | self.newvalue = newvalue |
69 | self.monitored = monitored | 62 | self.monitored = monitored |
70 | self.related = [] | ||
71 | self.filechanges = None | 63 | self.filechanges = None |
72 | 64 | ||
73 | def __str__(self): | 65 | def __str__(self): |
@@ -206,13 +198,6 @@ class ChangeRecord: | |||
206 | else: | 198 | else: |
207 | out = '{} changed from "{colour_remove}{}{colour_default}" to "{colour_add}{}{colour_default}"'.format(self.fieldname, self.oldvalue, self.newvalue, **colours) | 199 | out = '{} changed from "{colour_remove}{}{colour_default}" to "{colour_add}{}{colour_default}"'.format(self.fieldname, self.oldvalue, self.newvalue, **colours) |
208 | 200 | ||
209 | if self.related: | ||
210 | for chg in self.related: | ||
211 | if not outer and chg.fieldname in ['PE', 'PV', 'PR']: | ||
212 | continue | ||
213 | for line in chg._str_internal(False).splitlines(): | ||
214 | out += '\n * %s' % line | ||
215 | |||
216 | return '%s%s' % (prefix, out) if out else '' | 201 | return '%s%s' % (prefix, out) if out else '' |
217 | 202 | ||
218 | class FileChange: | 203 | class FileChange: |
@@ -635,17 +620,6 @@ def process_changes(repopath, revision1, revision2='HEAD', report_all=False, rep | |||
635 | chg = ChangeRecord(path, filename[7:], d.a_blob.data_stream.read().decode('utf-8'), '', True) | 620 | chg = ChangeRecord(path, filename[7:], d.a_blob.data_stream.read().decode('utf-8'), '', True) |
636 | changes.append(chg) | 621 | changes.append(chg) |
637 | 622 | ||
638 | # Link related changes | ||
639 | for chg in changes: | ||
640 | if chg.monitored: | ||
641 | for chg2 in changes: | ||
642 | # (Check dirname in the case of fields from recipe info files) | ||
643 | if chg.path == chg2.path or os.path.dirname(chg.path) == chg2.path: | ||
644 | if chg2.fieldname in related_fields.get(chg.fieldname, []): | ||
645 | chg.related.append(chg2) | ||
646 | elif chg.path == chg2.path and chg.path.startswith('packages/') and chg2.fieldname in ['PE', 'PV', 'PR']: | ||
647 | chg.related.append(chg2) | ||
648 | |||
649 | # filter out unwanted paths | 623 | # filter out unwanted paths |
650 | if exclude_path: | 624 | if exclude_path: |
651 | for chg in changes: | 625 | for chg in changes: |