[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/rorpiter.py

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 08/07/30 00:58:35

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : rorpiter.py 

Log message:
        Don't crash if a CacheIndexable tries to clear a non-existent cache 
entry.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.295&r2=1.296
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/rorpiter.py?cvsroot=rdiff-backup&r1=1.28&r2=1.29

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -b -r1.295 -r1.296
--- CHANGELOG   27 Jul 2008 13:57:23 -0000      1.295
+++ CHANGELOG   30 Jul 2008 00:58:34 -0000      1.296
@@ -1,3 +1,10 @@
+New in v1.2.1 (????/??/??)
+---------------------------
+
+Don't crash if a CacheIndexable tries to clear a non-existent cache entry,
+since the entry must already be cleared. (Andrew Ferguson)
+
+
 New in v1.2.0 (2008/07/27)
 ---------------------------
 

Index: rdiff_backup/rorpiter.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/rorpiter.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- rdiff_backup/rorpiter.py    24 Oct 2005 17:16:05 -0000      1.28
+++ rdiff_backup/rorpiter.py    30 Jul 2008 00:58:35 -0000      1.29
@@ -345,7 +345,11 @@
                self.cache_indicies.append(next_index)
 
                if len(self.cache_indicies) > self.cache_size: 
+                       try:
                        del self.cache_dict[self.cache_indicies[0]]
+                       except KeyError:
+                               log.Log("Warning: index %s missing from 
iterator cache" %
+                                       (first_index,),2)
                        del self.cache_indicies[0]
 
                return next_elem