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

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 07/07/26 14:12:11

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : compare.py 

Log message:
        Fix "too many open files" bug when handling large directories.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.234&r2=1.235
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/compare.py?cvsroot=rdiff-backup&r1=1.5&r2=1.6

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -b -r1.234 -r1.235
--- CHANGELOG   18 Jul 2007 21:52:11 -0000      1.234
+++ CHANGELOG   26 Jul 2007 14:12:11 -0000      1.235
@@ -1,6 +1,9 @@
 New in v1.1.13 (????/??/??)
 ---------------------------
 
+Fix "too many open files" bug when handling large directories. Patch
+from Anonymous in Savannah bug #20528.
+
 New options: --tempdir and --remote-tempdir. The first one sets the
 directory that rdiff-backup uses for temporary files on the local system.
 The second adds the --tempdir option with the given path when invoking

Index: rdiff_backup/compare.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/compare.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- rdiff_backup/compare.py     23 Feb 2006 02:57:19 -0000      1.5
+++ rdiff_backup/compare.py     26 Jul 2007 14:12:11 -0000      1.6
@@ -224,7 +224,7 @@
                        """Return 0 if full compare of data matches, 1 
otherwise"""
                        if src_rp.getsize() != repo_rorp.getsize(): return 1
                        return not robust.check_common_error(error_handler,
-                                rpath.cmpfileobj, (src_rp.open("rb"), 
repo_rorp.open("rb")))
+                                rpath.cmp, (src_rp, repo_rorp))
 
                for repo_rorp in repo_iter:
                        src_rp = src_root.new_index(repo_rorp.index)