Merge branch 'https://github.com/sergeymazin/python-bareos.git master'

joergsteffens · joergsteffens · commit f1ce1f787186 · 2017-12-08T17:34:17.000+01:00
diff --git a/bareos/bsock/lowlevel.py b/bareos/bsock/lowlevel.py
@@ -199,7 +199,7 @@ def recv_msg(self, regex = b'^\d\d\d\d OK.*$', timeout = None):
                         # check for regex in new submsg
                         # and last line in old message,
                         # which might have been incomplete without new submsg.
-                        lastlineindex = self.receive_buffer.rfind('\n') + 1
+                        lastlineindex = self.receive_buffer.rfind(b'\n') + 1
                         self.receive_buffer += submsg
                         match = re.search(regex, self.receive_buffer[lastlineindex:], re.MULTILINE)
                         # Bareos indicates end of command result by line starting with 4 digits
