From 42c445bc04afe19413b2d89719400ef1f1bbf9c9 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 20 Mar 2012 16:06:28 +0000 Subject: 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 Signed-off-by: Richard Purdie --- meta/lib/oe/buildhistory_analysis.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'meta/lib') diff --git a/meta/lib/oe/buildhistory_analysis.py b/meta/lib/oe/buildhistory_analysis.py index 4f55d9ab68..313416cf74 100644 --- a/meta/lib/oe/buildhistory_analysis.py +++ b/meta/lib/oe/buildhistory_analysis.py @@ -49,8 +49,8 @@ class ChangeRecord: def __str__(self): return self._str_internal(True) - def _str_internal(self, pathprefix): - if pathprefix: + def _str_internal(self, outer): + if outer: prefix = '%s: ' % self.path else: prefix = '' @@ -91,7 +91,7 @@ class ChangeRecord: percentchg = 100 out = '%s changed from %s to %s (%s%d%%)' % (self.fieldname, self.oldvalue or "''", self.newvalue or "''", '+' if percentchg > 0 else '', percentchg) elif self.fieldname in img_monitor_files: - if pathprefix: + if outer: prefix = 'Changes to %s ' % self.path out = '(%s):\n ' % self.fieldname if self.filechanges: @@ -107,6 +107,8 @@ class ChangeRecord: if self.related: for chg in self.related: + if not outer and chg.fieldname in ['PE', 'PV', 'PR']: + continue for line in chg._str_internal(False).splitlines(): out += '\n * %s' % line -- cgit v1.2.3-54-g00ecf