From eb2c6aad27cd41f18b182294bcb414924fe7e676 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Mon, 28 Mar 2016 11:17:25 +0000 Subject: [PATCH] Remove redundant notes about arch:all packages In an architecture only migration, we currently see two notes for every arch:all packages: * Ignoring "new" arch:all package * Ignoring "removal" of arch:all package But a closer look at the situation is that the arch:all packages is generally the same in both testing and the source suite. This commit removes these notes when the arch:all is the same in both suites. Signed-off-by: Niels Thykier --- britney.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/britney.py b/britney.py index 12096c1..0b1d5ac 100755 --- a/britney.py +++ b/britney.py @@ -1058,7 +1058,9 @@ class Britney(object): # if the new binary package is architecture-independent, then skip it if binary_u[ARCHITECTURE] == 'all': - excuse.addhtml("Ignoring %s %s (from %s) as it is arch: all" % (pkg_name, binary_u[VERSION], pkgsv)) + if pkg_id not in source_t[BINARIES]: + # only add a note if the arch:all does not match the expected version + excuse.addhtml("Ignoring %s %s (from %s) as it is arch: all" % (pkg_name, binary_u[VERSION], pkgsv)) continue # if the new binary package is not from the same source as the testing one, then skip it @@ -1127,7 +1129,9 @@ class Britney(object): # if the package is architecture-independent, then ignore it tpkg_data = packages_t_a[pkg] if tpkg_data[ARCHITECTURE] == 'all': - excuse.addhtml("Ignoring removal of %s as it is arch: all" % (pkg)) + if pkg_id not in source_u[BINARIES]: + # only add a note if the arch:all does not match the expected version + excuse.addhtml("Ignoring removal of %s as it is arch: all" % (pkg)) continue # if the package is not produced by the new source package, then remove it from testing if pkg not in packages_s_a: