From d28aa20c74c00625c7bccf04479174bd48c96dff Mon Sep 17 00:00:00 2001 From: Bike Dude Date: Tue, 3 Oct 2017 12:08:34 +0200 Subject: [PATCH 1/4] survey runner bugfix --- salt/runners/survey.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/runners/survey.py b/salt/runners/survey.py index 3fd2b1014f..591840060c 100644 --- a/salt/runners/survey.py +++ b/salt/runners/survey.py @@ -171,7 +171,7 @@ def _get_pool_results(*args, **kwargs): # hash minion return values as a string for minion in sorted(minions): - digest = hashlib.sha256(str(minions[minion])).hexdigest() + digest = hashlib.sha256(str(minions[minion]).encode('utf-8')).hexdigest() if digest not in ret: ret[digest] = {} ret[digest]['pool'] = [] From 2dbee2b0fc27fc9ad85ec8f3a3a233d86124db71 Mon Sep 17 00:00:00 2001 From: Bike Dude Date: Wed, 4 Oct 2017 20:50:03 +0200 Subject: [PATCH 2/4] survey runner bugfix --- salt/runners/survey.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/runners/survey.py b/salt/runners/survey.py index 591840060c..6607d8951c 100644 --- a/salt/runners/survey.py +++ b/salt/runners/survey.py @@ -171,7 +171,7 @@ def _get_pool_results(*args, **kwargs): # hash minion return values as a string for minion in sorted(minions): - digest = hashlib.sha256(str(minions[minion]).encode('utf-8')).hexdigest() + digest = hashlib.sha256(str(minions[minion]).encode(__salt_system_encoding__)).hexdigest() if digest not in ret: ret[digest] = {} ret[digest]['pool'] = [] From ae03b70b19317252df4167f26fd0fc2fca9ced46 Mon Sep 17 00:00:00 2001 From: Bike Dude Date: Wed, 4 Oct 2017 20:55:38 +0200 Subject: [PATCH 3/4] survey runner bugfix --- salt/runners/survey.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/runners/survey.py b/salt/runners/survey.py index 591840060c..6607d8951c 100644 --- a/salt/runners/survey.py +++ b/salt/runners/survey.py @@ -171,7 +171,7 @@ def _get_pool_results(*args, **kwargs): # hash minion return values as a string for minion in sorted(minions): - digest = hashlib.sha256(str(minions[minion]).encode('utf-8')).hexdigest() + digest = hashlib.sha256(str(minions[minion]).encode(__salt_system_encoding__)).hexdigest() if digest not in ret: ret[digest] = {} ret[digest]['pool'] = [] From 7f004adca10e66cb1686cd2987b4b16d9d5a14aa Mon Sep 17 00:00:00 2001 From: Bike Dude Date: Thu, 5 Oct 2017 19:02:55 +0200 Subject: [PATCH 4/4] survey runner bugfix --- salt/runners/survey.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/runners/survey.py b/salt/runners/survey.py index 6607d8951c..d7337352f9 100644 --- a/salt/runners/survey.py +++ b/salt/runners/survey.py @@ -171,7 +171,7 @@ def _get_pool_results(*args, **kwargs): # hash minion return values as a string for minion in sorted(minions): - digest = hashlib.sha256(str(minions[minion]).encode(__salt_system_encoding__)).hexdigest() + digest = hashlib.sha256(str(minions[minion]).encode(__salt_system_encoding__)).hexdigest() if digest not in ret: ret[digest] = {} ret[digest]['pool'] = []