diff options
| author | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2005-08-14 04:15:47 +0000 |
|---|---|---|
| committer | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2005-08-14 04:15:47 +0000 |
| commit | 2429ac3b577dfc3ebc9f90f27acc4d00a5ae9620 (patch) | |
| tree | 43b6cf09897d0c06003689dab36ac0a7c4d3adf8 /rdiff-backup/rdiff_backup/rpath.py | |
| parent | 8a11971d5a45979b330c8e729ccf418835f324a8 (diff) | |
| download | rdiff-backup-2429ac3b577dfc3ebc9f90f27acc4d00a5ae9620.tar.gz | |
Updated inctest - before it would compare increment attributes too strictly
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@612 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/rdiff_backup/rpath.py')
| -rw-r--r-- | rdiff-backup/rdiff_backup/rpath.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/rdiff-backup/rdiff_backup/rpath.py b/rdiff-backup/rdiff_backup/rpath.py index 2816c91..42ad5e9 100644 --- a/rdiff-backup/rdiff_backup/rpath.py +++ b/rdiff-backup/rdiff_backup/rpath.py @@ -352,7 +352,8 @@ class RORPath: 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 @@ class RORPath: (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 |