From 002cfcdf79690cc9ff443192a07c7eb798eb8f68 Mon Sep 17 00:00:00 2001
From: Jan Pokorný <jpokorny@redhat.com>
Date: Fri, 14 Nov 2014 21:01:25 +0100
Subject: format: HASHALGO default is set in defaults.py/setup.cfg
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
---
 format.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'format.py')

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)
-- 
cgit