particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

account for ignored self-provides in rpmdiff hash

Browse source
This commit is contained in:
Mike McLean 2018-04-24 15:14:23 -04:00
parent c67dcee3ad
commit 79a59c9d47
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
koji/rpmdiff.py
View file

@ -186,8 +186,6 @@ class Rpmdiff:
o = zip(old[name], oldflags, old[name[:-1]+'VERSION'])
n = zip(new[name], newflags, new[name[:-1]+'VERSION'])
self.old_data[name] = sorted(o)
self.new_data[name] = sorted(n)
if name == 'PROVIDES': # filter our self provide
oldNV = (old['name'], rpm.RPMSENSE_EQUAL,
@ -197,6 +195,9 @@ class Rpmdiff:
o = [entry for entry in o if entry != oldNV]
n = [entry for entry in n if entry != newNV]
self.old_data[name] = sorted(o)
self.new_data[name] = sorted(n)
for oldentry in o:
if not oldentry in n:
if name == 'REQUIRES' and oldentry[1] & self.PREREQ_FLAG: