summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorowsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2009-01-07 01:16:31 +0000
committerowsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2009-01-07 01:16:31 +0000
commitb554b71de056bfee4651f752e0da8746705035c3 (patch)
tree35b4a3f2a5e6cca16ffde0c9c854bd9b1d4445a1
parent731c4d62b98d6603b643f16516af340442869bbf (diff)
downloadrdiff-backup-b554b71de056bfee4651f752e0da8746705035c3.tar.gz
Fix --override-chars-to-quote
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/branches/r1-2@1007 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
-rw-r--r--rdiff-backup/CHANGELOG6
-rw-r--r--rdiff-backup/rdiff_backup/fs_abilities.py1
2 files changed, 7 insertions, 0 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG
index f5e4ab1..6536049 100644
--- a/rdiff-backup/CHANGELOG
+++ b/rdiff-backup/CHANGELOG
@@ -1,3 +1,9 @@
+New in v1.2.6 (????/??/??)
+---------------------------
+
+Fix --override-chars-to-quote option. (Andrew Ferguson)
+
+
New in v1.2.5 (2009/01/06)
---------------------------
diff --git a/rdiff-backup/rdiff_backup/fs_abilities.py b/rdiff-backup/rdiff_backup/fs_abilities.py
index d303d7a..12e2632 100644
--- a/rdiff-backup/rdiff_backup/fs_abilities.py
+++ b/rdiff-backup/rdiff_backup/fs_abilities.py
@@ -796,6 +796,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):