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

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 09/01/31 18:27:38

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : selection.py 

Log message:
        Change --min-file-size and --max-file-size to agree with man page.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.352&r2=1.353
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/selection.py?cvsroot=rdiff-backup&r1=1.47&r2=1.48

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -b -r1.352 -r1.353
--- CHANGELOG   31 Jan 2009 18:11:18 -0000      1.352
+++ CHANGELOG   31 Jan 2009 18:27:37 -0000      1.353
@@ -1,6 +1,10 @@
 New in v1.3.2 (????/??/??)
 ---------------------------
 
+Change --min-file-size and --max-file-size to agree with man page. These
+options no longer include files, and will only apply to regular files. Thanks
+to Johannes Jensen for the suggestion. (Andrew Ferguson)
+
 Improve error message if regress operation fails due to Security Violation.
 Thanks to Grzegorz Marszalek for the bug report. (Andrew Ferguson)
 

Index: rdiff_backup/selection.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/selection.py,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- rdiff_backup/selection.py   4 Sep 2008 23:36:20 -0000       1.47
+++ rdiff_backup/selection.py   31 Jan 2009 18:27:37 -0000      1.48
@@ -531,8 +531,10 @@
                """Return selection function given by filesize"""
                size = int(sizestr)
                assert size > 0
-               if min_max: sel_func = lambda rp: (rp.getsize() <= size)
-               else: sel_func = lambda rp: (rp.getsize() >= size)
+               def sel_func(rp):
+                       if not rp.isreg(): return None
+                       if min_max: return ((rp.getsize() <= size) and None)
+                       else: return ((rp.getsize() >= size) and None)
                sel_func.exclude = 1
                sel_func.name = "%s size %d" % (min_max and "Maximum" or 
"Minimum", size)
                return sel_func