diff options
| author | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2008-01-02 01:53:22 +0000 |
|---|---|---|
| committer | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2008-01-02 01:53:22 +0000 |
| commit | 7a44ba5463b2a956b6fc6f98c3442a856ae7ac8b (patch) | |
| tree | 7b9008691355ccf5164e35958a8e993ffe94dae8 | |
| parent | 286cc36496793337279c56b881418aa31590a2da (diff) | |
| download | rdiff-backup-7a44ba5463b2a956b6fc6f98c3442a856ae7ac8b.tar.gz | |
Don't print the warning about hard links if the user has specified the
--no-hard-links option.
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@861 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
| -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 |