diff options
-rw-r--r-- | rdiff-backup/CHANGELOG | 3 | ||||
-rw-r--r-- | rdiff-backup/rdiff_backup/fs_abilities.py | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG index e4420b8..05ab0f4 100644 --- a/rdiff-backup/CHANGELOG +++ b/rdiff-backup/CHANGELOG @@ -1,6 +1,9 @@ New in v1.1.15 (????/??/??) --------------------------- +Don't print the warning message about unsupported hard links if the user +has specified the --no-hard-links option. (Suggested by Andreas Olsson) + Print a more helpful error message when we get a "Result too large" error when trying to copy a file. (Andrew Ferguson) diff --git a/rdiff-backup/rdiff_backup/fs_abilities.py b/rdiff-backup/rdiff_backup/fs_abilities.py index 7646d87..2274104 100644 --- a/rdiff-backup/rdiff_backup/fs_abilities.py +++ b/rdiff-backup/rdiff_backup/fs_abilities.py @@ -185,8 +185,9 @@ class FSAbilities: if hl_source.getinode() != hl_dest.getinode(): raise IOError(errno.EOPNOTSUPP, "Hard links don't compare") except (IOError, OSError): - log.Log("Warning: hard linking not supported by filesystem " - "at %s" % (self.root_rp.path,), 3) + if Globals.preserve_hardlinks != 0: + log.Log("Warning: hard linking not supported by filesystem " + "at %s" % (self.root_rp.path,), 3) self.hardlinks = 0 else: self.hardlinks = 1 |