commit: bcffd2ef3fc347d6ce346a1737ddbd0ed0b7dff6
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 17 17:27:08 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 17 18:55:23 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=bcffd2ef
catalyst: Make conf_values['digests'] a set
This makes it automatically deduplicate values (which I honestly don't
really care about) but also makes it so users don't need to .split()
themselves.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
catalyst/base/genbase.py | 2 +-
catalyst/main.py | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/catalyst/base/genbase.py b/catalyst/base/genbase.py
index bc7f9375..eb09a4e0 100644
--- a/catalyst/base/genbase.py
+++ b/catalyst/base/genbase.py
@@ -37,5 +37,5 @@ class GenBase():
with io.open(path + '.DIGESTS', 'w', encoding='utf-8') as file:
for f in [path, path + '.CONTENTS']:
- for i in self.settings['digests'].split():
+ for i in self.settings['digests']:
file.write(self.generate_hash(f, name=i))
diff --git a/catalyst/main.py b/catalyst/main.py
index d8e791c4..c91fc8b6 100644
--- a/catalyst/main.py
+++ b/catalyst/main.py
@@ -341,8 +341,9 @@ def _main(parser, opts):
# TODO add capability to config/spec new definitions
if "digests" in conf_values:
- digests = set(conf_values['digests'].split())
valid_digests = hashlib.algorithms_available
+ digests = set(conf_values['digests'].split())
+ conf_values['digests'] = digests
# First validate all the requested digests are valid keys.
if digests - valid_digests:
