From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ADF79138351 for ; Fri, 17 Apr 2020 19:52:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 06BFEE088B; Fri, 17 Apr 2020 19:52:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DFDE7E089B for ; Fri, 17 Apr 2020 19:52:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 028E334F146 for ; Fri, 17 Apr 2020 19:52:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6D6551DE for ; Fri, 17 Apr 2020 19:52:26 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1587107304.907f5a20e28ef9fed45595bdc68daaebd36d5281.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/genbase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 907f5a20e28ef9fed45595bdc68daaebd36d5281 X-VCS-Branch: master Date: Fri, 17 Apr 2020 19:52:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c24391cc-08d9-448d-abef-5ead52816377 X-Archives-Hash: fbb80a2be1d320320c62a459a691edfe commit: 907f5a20e28ef9fed45595bdc68daaebd36d5281 Author: Matt Turner gentoo org> AuthorDate: Fri Apr 17 07:03:14 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Apr 17 07:08:24 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=907f5a20 catalyst: Remove guard rails on duplicate digests Signed-off-by: Matt Turner gentoo.org> catalyst/base/genbase.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/catalyst/base/genbase.py b/catalyst/base/genbase.py index e75e6e3c..f55b113f 100644 --- a/catalyst/base/genbase.py +++ b/catalyst/base/genbase.py @@ -37,17 +37,13 @@ class GenBase(): hash_map = self.settings["hash_map"] if os.path.exists(path): with io.open(digests, "w", encoding='utf-8') as myf: - keys = {} - for i in self.settings["digests"].split(): - keys[i] = 1 - array = sorted(keys.keys()) for f in [path, path + '.CONTENTS']: if os.path.exists(f): - if "all" in array: + if "all" in self.settings["digests"].split(): for k in list(hash_map.hash_map): digest = hash_map.generate_hash(f, hash_=k) myf.write(digest) else: - for j in array: + for j in self.settings["digests"].split(): digest = hash_map.generate_hash(f, hash_=j) myf.write(digest)