[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/fs_abilitie... [r1-2]

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Branch:         r1-2
Changes by:     Andrew Ferguson <owsla> 09/01/07 01:16:31

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : fs_abilities.py 

Log message:
        Fix --override-chars-to-quote

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&only_with_tag=r1-2&r1=1.338.2.1&r2=1.338.2.2
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/fs_abilities.py?cvsroot=rdiff-backup&only_with_tag=r1-2&r1=1.61&r2=1.61.2.1

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.338.2.1
retrieving revision 1.338.2.2
diff -u -b -r1.338.2.1 -r1.338.2.2
--- CHANGELOG   6 Jan 2009 21:11:15 -0000       1.338.2.1
+++ CHANGELOG   7 Jan 2009 01:16:30 -0000       1.338.2.2
@@ -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)
 ---------------------------
 

Index: rdiff_backup/fs_abilities.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/fs_abilities.py,v
retrieving revision 1.61
retrieving revision 1.61.2.1
diff -u -b -r1.61 -r1.61.2.1
--- rdiff_backup/fs_abilities.py        1 Jan 2009 16:56:29 -0000       1.61
+++ rdiff_backup/fs_abilities.py        7 Jan 2009 01:16:31 -0000       1.61.2.1
@@ -796,6 +796,7 @@
 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):