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

simplify ignore logic in rpmdiff function

Browse source
This commit is contained in:
Mike McLean 2018-08-08 12:33:07 -04:00
parent d1544e7f05
commit e559653ab5
1 changed files with 12 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

31
koji/rpmdiff.py
View file

@ -75,19 +75,12 @@ class Rpmdiff:
def __init__(self, old, new, ignore=None):
self.result = []
self.ignore = ignore
self.old_data = { 'tags': {}, 'ignore': ignore }
self.new_data = { 'tags': {}, 'ignore': ignore }
if self.ignore is None:
self.ignore = []
FILEIDX = [entry[:] for entry in self.__FILEIDX]
for tag in self.ignore:
for entry in FILEIDX:
if tag == entry[0]:
# store marked position for erasing data
entry[1] = -entry[1] - 100
break
if ignore is None:
ignore = set()
else:
ignore = set(ignore)
old = self.__load_pkg(old)
new = self.__load_pkg(new)
@ -133,16 +126,16 @@ class Rpmdiff:
self.__add(self.FORMAT, (self.REMOVED, f))
else:
format = ''
for entry in FILEIDX:
if entry[1] >= 0 and \
old_file[entry[1]] != new_file[entry[1]]:
for entry in self.__FILEIDX:
# entry = [character, value]
if entry[0] in ignore:
# erase fields which are ignored
old_file[entry[1]] = None
new_file[entry[1]] = None
format = format + '.'
elif old_file[entry[1]] != new_file[entry[1]]:
format = format + entry[0]
diff = 1
elif entry[1] < 0:
# erase fields which are ignored
old_file[-entry[1] - 100] = None
new_file[-entry[1] - 100] = None
format = format + '.'
else:
format = format + '.'
if diff: