summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rdiff-backup/CHANGELOG2
-rw-r--r--rdiff-backup/rdiff_backup/fs_abilities.py1
2 files changed, 3 insertions, 0 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG
index 4cb6c0e..c35b4a0 100644
--- a/rdiff-backup/CHANGELOG
+++ b/rdiff-backup/CHANGELOG
@@ -1,6 +1,8 @@
New in v1.3.1 (????/??/??)
---------------------------
+Fix --override-chars-to-quote option. (Andrew Ferguson)
+
Fix typo in robust.py which broke error reporting. Closes Savannah bug #25255.
Ignore Windows errors caused by too long filenames; the files are not yet
diff --git a/rdiff-backup/rdiff_backup/fs_abilities.py b/rdiff-backup/rdiff_backup/fs_abilities.py
index 58480de..d57e0d8 100644
--- a/rdiff-backup/rdiff_backup/fs_abilities.py
+++ b/rdiff-backup/rdiff_backup/fs_abilities.py
@@ -846,6 +846,7 @@ backed up onto it.
By specificying the --force option, rdiff-backup will migrate the
repository from the old quoting chars to the new ones.""" %
(suggested_ctq, actual_ctq, ctq_rp.path))
+ return (actual_ctq, None) # Maintain Globals override
class RestoreSetGlobals(SetGlobals):