cleanup

joergsteffens · joergsteffens · commit aea74c1c696a · 2018-01-19T17:52:15.000+01:00
diff --git a/README.rst b/README.rst
@@ -3,7 +3,7 @@ python-bareos
 
 Python module to access a http://www.bareos.org backup system.
 
-* prebuild packages available at http://download.bareos.org/bareos/contrib/
+`python-bareos` packages are included in the Bareos core distribution since bareos >= 17.2.
 
 
 calling bareos-director user agent commands
@@ -42,4 +42,3 @@ Requires: bareos >= 15.2
   directorconsole=bareos.bsock.DirectorConsoleJson(address="localhost", port=9101, password=password)
   directorconsole.call("list pools")
   ...
-
diff --git a/bareos/bsock/lowlevel.py b/bareos/bsock/lowlevel.py
@@ -205,7 +205,7 @@ def recv_msg(self, regex = b'^\d\d\d\d OK.*$', timeout = None):
                         # 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:lastlineindex+match.end()]
+                            result = self.receive_buffer[0: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):
@@ -260,8 +260,9 @@ def _show_result(self, msg):
         #print(msg.decode('utf-8'))
         sys.stdout.write(msg.decode('utf-8'))
         # add a linefeed, if there isn't one already
-        if msg[-2] != ord(b'\n'):
-            sys.stdout.write(b'\n')
+        if len(msg) >= 2:
+            if msg[-2] != ord(b'\n'):
+                sys.stdout.write(b'\n')
 
 
     def __get_header(self):
