summaryrefslogtreecommitdiffstats
path: root/format.py
diff options
context:
space:
mode:
authorJan Pokorný <jpokorny@redhat.com>2014-11-14 21:01:25 +0100
committerJan Pokorný <jpokorny@redhat.com>2014-11-14 22:11:36 +0100
commit002cfcdf79690cc9ff443192a07c7eb798eb8f68 (patch)
tree549e5ff754873643d78ebd7d1b80130964f6db40 /format.py
parentd6ab50d618a5da8cb38d6e9e0d9c4b8bab6b240a (diff)
downloadclufter-002cfcdf79690cc9ff443192a07c7eb798eb8f68.tar.gz
clufter-002cfcdf79690cc9ff443192a07c7eb798eb8f68.tar.xz
clufter-002cfcdf79690cc9ff443192a07c7eb798eb8f68.zip
format: HASHALGO default is set in defaults.py/setup.cfg
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
Diffstat (limited to 'format.py')
-rw-r--r--format.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/format.py b/format.py
index 6fe0f2f..1fc44e4 100644
--- a/format.py
+++ b/format.py
@@ -20,6 +20,10 @@ from warnings import warn
from lxml import etree
+try:
+ from .defaults import HASHALGO
+except ImportError:
+ HASHALGO = 'md5'
from .error import ClufterError
from .plugin_registry import MetaPlugin, PluginRegistry
from .protocol import Protocol
@@ -383,7 +387,7 @@ class SimpleFormat(Format):
# w/o salt: md5sum $FILE
# with salt: { stat --printf "%Y" $FILE; cat $FILE; } | md5sum
salt = ''
- hash_algo = getenv_namespaced('HASHALGO', 'md5')
+ hash_algo = getenv_namespaced('HASHALGO', HASHALGO)
do_salt = getenv_namespaced('NOSALT', '0') in ('0', 'false')
try:
hash_algo = getattr(hashlib, hash_algo)