[Rdiff-backup-commits] Changes to rdiff-backup/rdiff_backup/rpath.py

[Ben Escoto]

Index: rdiff-backup/rdiff_backup/rpath.py
diff -u rdiff-backup/rdiff_backup/rpath.py:1.82 
rdiff-backup/rdiff_backup/rpath.py:1.83
--- rdiff-backup/rdiff_backup/rpath.py:1.82     Thu Aug 11 03:34:03 2005
+++ rdiff-backup/rdiff_backup/rpath.py  Sun Aug 14 04:15:47 2005
@@ -352,7 +352,8 @@
 
        def equal_verbose(self, other, check_index = 1,
                                          compare_inodes = 0, compare_ownership 
= 0,
-                                         compare_acls = 0, compare_eas = 0, 
verbosity = 2):
+                                         compare_acls = 0, compare_eas = 0, 
compare_size = 1,
+                                         compare_type = 1, verbosity = 2):
                """Like __eq__, but log more information.  Useful when 
testing"""
                if check_index and self.index != other.index:
                        log.Log("Index %s != index %s" % (self.index, 
other.index),
@@ -364,10 +365,11 @@
                                (self.issym() or not compare_ownership)):
                                # Don't compare gid/uid for symlinks, or if 
told not to
                                pass
+                       elif key == 'type' and not compare_type: pass
                        elif key == 'atime' and not Globals.preserve_atime: pass
                        elif key == 'ctime': pass
                        elif key == 'devloc' or key == 'nlink': pass
-                       elif key == 'size' and not self.isreg(): pass
+                       elif key == 'size' and (not self.isreg() or not 
compare_size): pass
                        elif key == 'inode' and (not self.isreg() or not 
compare_inodes):
                                pass
                        elif key == 'ea' and not compare_eas: pass