b17d3e3575
- Fix the usage of custom macros on the spec file. - Fix RES7: different dependency names for python-PyYAML and python-MarkupSafe - Build both python2 and python3 binaries together. - Bugfix: errors in external pillar causes crash instead of report of them (bsc#1068446) - Fix 'user.present' when 'gid_from_name' is set but group does not exist. - Added: * bugfix-the-logic-according-to-the-exact-described-pu.patch * return-error-when-gid_from_name-and-group-does-not-e.patch - Fix "No service execution module loaded" issue (bsc#1065792) - Set SHELL environment variable Added: * fix-bsc-1065792.patch * set-shell-environment-variable-64.patch - Removed unnecessary logging on shutdown (bsc#1050003) - Renamed patch that adds grain fqdns Changed: * catching-error-when-pidfile-cannot-be-deleted Removed: * fix-for-pidfile-removal-logging Renamed: * add-fqdns-grains -> feat-add-grain-for-all-fqdns OBS-URL: https://build.opensuse.org/request/show/569868 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=107
26 lines
999 B
Diff
26 lines
999 B
Diff
From d21ea1062f1cd8da0e604288b369c7ff38919c78 Mon Sep 17 00:00:00 2001
|
|
From: Michael Calmer <mc@suse.de>
|
|
Date: Tue, 19 Dec 2017 17:07:19 +0100
|
|
Subject: [PATCH] python3 compatibility fix - got bytes instead of string
|
|
|
|
---
|
|
salt/netapi/rest_cherrypy/tools/websockets.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/salt/netapi/rest_cherrypy/tools/websockets.py b/salt/netapi/rest_cherrypy/tools/websockets.py
|
|
index fe4f9def85..44c5e2fa05 100644
|
|
--- a/salt/netapi/rest_cherrypy/tools/websockets.py
|
|
+++ b/salt/netapi/rest_cherrypy/tools/websockets.py
|
|
@@ -54,6 +54,6 @@ class SynchronizingWebsocket(WebSocket):
|
|
This ensures completion of the underlying websocket connection
|
|
and can be used to synchronize parallel senders.
|
|
'''
|
|
- if message.data == 'websocket client ready':
|
|
+ if message.data.decode('utf-8') == 'websocket client ready':
|
|
self.pipe.send(message)
|
|
self.send('server received message', False)
|
|
--
|
|
2.13.6
|
|
|
|
|