From: Eduardo Robles Elvira <edulix@wadobo.com>
Date: Sun, 11 Aug 2013 17:37:04 +0000 (+0200)
Subject: fixing again tarfile.readline..
X-Git-Tag: v2.2~111
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=1215b602bbf26d02e81fdbe309c301f93f8a9516;p=python-delta-tar

fixing again tarfile.readline..
---

diff --git a/deltatar/tarfile.py b/deltatar/tarfile.py
index 1e7c3b9..ede5175 100644
--- a/deltatar/tarfile.py
+++ b/deltatar/tarfile.py
@@ -694,8 +694,7 @@ class _Stream:
             self.dbuf = self.dbuf[pos:]
             return ret
 
-        buf = [self.dbuf]
-        self.dbuf = ""
+        buf = []
         while True:
             chunk = self._read(self.bufsize)
 
@@ -709,7 +708,7 @@ class _Stream:
             if '\n' in chunk:
                 dbuf = ''.join(buf)
                 pos = dbuf.index('\n') + 1
-                self.dbuf = dbuf[pos:]
+                self.dbuf = dbuf[pos:] + self.dbuf
                 return dbuf[:pos]
 
     def _read(self, size):
diff --git a/testing/test_deltatar.py b/testing/test_deltatar.py
index 3020f0b..398540c 100644
--- a/testing/test_deltatar.py
+++ b/testing/test_deltatar.py
@@ -1065,11 +1065,8 @@ class DeltaTarTest(BaseTest):
             else:
                 os.unlink(path)
 
-        try:
-            deltatar.create_diff_backup("source_dir_diff", "backup_dir2",
+        deltatar.create_diff_backup("source_dir_diff", "backup_dir2",
                                     prev_index_path)
-        except Exception, e:
-            import ipdb; ipdb.set_trace()
 
         # first restore initial backup in target_dir
         tar_filename = deltatar.volume_name_func('backup_dir', True, 0)