diff options
author | Joerg Steffens <joerg.steffens@bareos.com> | 2018-01-19 18:31:03 +0300 |
---|---|---|
committer | Joerg Steffens <joerg.steffens@bareos.com> | 2018-01-19 18:31:03 +0300 |
commit | e44b09b0fe069e7dfde02fe7eabb331763ce75de (patch) | |
tree | d292e3b1fa020cde8a979951115580e70894e0ce | |
parent | 1004dec55bcb670d73b8ad61d82bbeed4a1ba3e3 (diff) | |
parent | fa8ff57d72aa4d0a883fc22e97fa7df977574364 (diff) |
Merge branch 'IvanBayan-fix-recv-msg'
-rw-r--r-- | bareos/bsock/lowlevel.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bareos/bsock/lowlevel.py b/bareos/bsock/lowlevel.py index 875c2f6..71c8a55 100644 --- a/bareos/bsock/lowlevel.py +++ b/bareos/bsock/lowlevel.py @@ -205,7 +205,7 @@ class LowLevel(object): # Bareos indicates end of command result by line starting with 4 digits if match: self.logger.debug("msg \"{0}\" matches regex \"{1}\"".format(self.receive_buffer.strip(), regex)) - result = self.receive_buffer[0:lastlineindex] + self.receive_buffer[lastlineindex:match.end()] + result = self.receive_buffer[0:lastlineindex] + self.receive_buffer[lastlineindex:lastlineindex+match.end()] self.receive_buffer = self.receive_buffer[lastlineindex+match.end()+1:] return result #elif re.search("^\d\d\d\d .*$", msg, re.MULTILINE): |