From 23fc96244058ddd92c3de295739eaeec96e1642f Mon Sep 17 00:00:00 2001 From: Denis Silakov Date: Tue, 18 Feb 2014 12:42:36 +0400 Subject: [PATCH] recognize situation when noarch package becomes arch-specific and vice versa --- rpm5utils/synthesis.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpm5utils/synthesis.py b/rpm5utils/synthesis.py index f6bb8a5..f720b13 100644 --- a/rpm5utils/synthesis.py +++ b/rpm5utils/synthesis.py @@ -383,7 +383,7 @@ class PackageSet: arch = ARCH in_repo = nevr.N in self.packages - new_arch_correct = arch == ARCH + new_arch_correct = (arch == ARCH or arch == 'noarch' or ARCH == 'noarch') if in_repo: if nevr.DE == self.packages[nevr.N]['nevr'].DE: @@ -391,7 +391,7 @@ class PackageSet: else: ver_newer = (nevr.DE > self.packages[nevr.N]['nevr'].DE) - old_arch_correct = self.packages[nevr.N]['arch'] == ARCH + old_arch_correct = (self.packages[nevr.N]['arch'] == ARCH or self.packages[nevr.N]['arch'] == 'noarch' or ARCH == 'noarch') else: ver_newer = None old_arch_correct = None