[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> 08/09/04 23:36:20

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : selection.py 

Log message:
        Expand --exclude-if-present option to also  support directories, 
symlinks, etc.

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

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -b -r1.300 -r1.301
--- CHANGELOG   25 Aug 2008 00:52:08 -0000      1.300
+++ CHANGELOG   4 Sep 2008 23:36:19 -0000       1.301
@@ -1,6 +1,8 @@
 New in v1.2.2 (????/??/??)
 ---------------------------
 
+Adjust --exclude-if-present option to support directories, symlinks, device
+files, etc. Closes bug #24192. Thanks to Vadim Zeitlin for the suggestion.
 
 
 New in v1.2.1 (2008/08/24)

Index: rdiff_backup/selection.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/selection.py,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- rdiff_backup/selection.py   13 May 2007 05:43:06 -0000      1.46
+++ rdiff_backup/selection.py   4 Sep 2008 23:36:20 -0000       1.47
@@ -478,7 +478,9 @@
                assert include == 0 or include == 1
 
                def sel_func(rp):
-                       if rp.isdir() and rp.readable() and 
rp.append(presence_filename).isreg(): return include
+                       if rp.isdir() and rp.readable() and \
+                                       rp.append(presence_filename).lstat():
+                               return include
                        return None
 
                sel_func.exclude = not include