Djam/urpm-tools
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/urpm-tools.git synced 2025-02-23 17:32:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

recognize situation when noarch package becomes arch-specific and vice versa

Browse source
This commit is contained in:
Denis Silakov 2014-02-18 12:42:36 +04:00
parent bbd45e1506
commit 23fc962440
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rpm5utils/synthesis.py
View file

@ -383,7 +383,7 @@ class PackageSet:
arch = ARCH arch = ARCH
in_repo = nevr.N in self.packages 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 in_repo:
if nevr.DE == self.packages[nevr.N]['nevr'].DE: if nevr.DE == self.packages[nevr.N]['nevr'].DE:
@ -391,7 +391,7 @@ class PackageSet:
else: else:
ver_newer = (nevr.DE > self.packages[nevr.N]['nevr'].DE) 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: else:
ver_newer = None ver_newer = None
old_arch_correct = None old_arch_correct = None