summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-03-20 16:06:28 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-21 15:33:07 (GMT)
commit42c445bc04afe19413b2d89719400ef1f1bbf9c9 (patch)
tree24da06bf5cb508ce7249f60bb84d5a2a8a276288 /meta/lib
parent4db604cd3a982ed0bac93df1f77d7206d8c7df8f (diff)
downloadpoky-42c445bc04afe19413b2d89719400ef1f1bbf9c9.tar.gz
buildhistory_analysis: avoid printing PE/PV/PR more than once
Don't print PE/PV/PR changes as related field changes of related field changes (i.e. only print them once at the top level). (From OE-Core rev: 33046605549501bed9ceff102614d86ba54a5891) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/buildhistory_analysis.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/lib/oe/buildhistory_analysis.py b/meta/lib/oe/buildhistory_analysis.py
index 4f55d9a..313416c 100644
--- a/meta/lib/oe/buildhistory_analysis.py
+++ b/meta/lib/oe/buildhistory_analysis.py
@@ -49,8 +49,8 @@ class ChangeRecord:
49 def __str__(self): 49 def __str__(self):
50 return self._str_internal(True) 50 return self._str_internal(True)
51 51
52 def _str_internal(self, pathprefix): 52 def _str_internal(self, outer):
53 if pathprefix: 53 if outer:
54 prefix = '%s: ' % self.path 54 prefix = '%s: ' % self.path
55 else: 55 else:
56 prefix = '' 56 prefix = ''
@@ -91,7 +91,7 @@ class ChangeRecord:
91 percentchg = 100 91 percentchg = 100
92 out = '%s changed from %s to %s (%s%d%%)' % (self.fieldname, self.oldvalue or "''", self.newvalue or "''", '+' if percentchg > 0 else '', percentchg) 92 out = '%s changed from %s to %s (%s%d%%)' % (self.fieldname, self.oldvalue or "''", self.newvalue or "''", '+' if percentchg > 0 else '', percentchg)
93 elif self.fieldname in img_monitor_files: 93 elif self.fieldname in img_monitor_files:
94 if pathprefix: 94 if outer:
95 prefix = 'Changes to %s ' % self.path 95 prefix = 'Changes to %s ' % self.path
96 out = '(%s):\n ' % self.fieldname 96 out = '(%s):\n ' % self.fieldname
97 if self.filechanges: 97 if self.filechanges:
@@ -107,6 +107,8 @@ class ChangeRecord:
107 107
108 if self.related: 108 if self.related:
109 for chg in self.related: 109 for chg in self.related:
110 if not outer and chg.fieldname in ['PE', 'PV', 'PR']:
111 continue
110 for line in chg._str_internal(False).splitlines(): 112 for line in chg._str_internal(False).splitlines():
111 out += '\n * %s' % line 113 out += '\n * %s' % line
112 114