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

use 'ignore' in hash computation

Browse source
This commit is contained in:
Tomas Kopecek 2018-03-14 11:17:43 +01:00 • committed by Mike McLean
parent 71d5bdc02d
commit 72d619929e
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
builder/kojid
View file

@ -1255,7 +1255,7 @@ class BuildArchTask(BaseBuildTask):
if rpmf.endswith('.noarch.rpm'):
fpath = os.path.join(resultdir, rpmf)
d = koji.rpmdiff.Rpmdiff(fpath, fpath, ignore='S5TN')
rpmdiff_hash[self.id][rpmf] = d.kojihash()
rpmdiff_hash[self.id][rpmf] = d.kojihash(ignore='S5TN')
if rpmdiff_hash[self.id]:
log_name = 'noarch_rpmdiff.json'
noarch_hash_path = os.path.join(broot.workdir, log_name)

4
koji/rpmdiff.py
View file

@ -74,8 +74,8 @@ class Rpmdiff:
def __init__(self, old, new, ignore=None):
self.result = []
self.ignore = ignore
self.old_data = { 'tags': {} }
self.new_data = { 'tags': {} }
self.old_data = { 'tags': {}, 'ignore': ignore }
self.new_data = { 'tags': {}, 'ignore': ignore }
if self.ignore is None:
self.ignore = []