From 72d619929e90ec8666e8d124f5f8c76398b0b66e Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: Wed, 14 Mar 2018 11:17:43 +0100 Subject: [PATCH] use 'ignore' in hash computation --- builder/kojid | 2 +- koji/rpmdiff.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builder/kojid b/builder/kojid index f9f46d2a..5bd366ad 100755 --- a/builder/kojid +++ b/builder/kojid @@ -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) diff --git a/koji/rpmdiff.py b/koji/rpmdiff.py index 14de022a..fa77dcc8 100644 --- a/koji/rpmdiff.py +++ b/koji/rpmdiff.py @@ -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 = []