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

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 09/01/07 01:23:21

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&r1=1.347&r2=1.348
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/fs_abilities.py?cvsroot=rdiff-backup&r1=1.66&r2=1.67

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -b -r1.347 -r1.348
--- CHANGELOG   6 Jan 2009 21:33:22 -0000       1.347
+++ CHANGELOG   7 Jan 2009 01:23:20 -0000       1.348
@@ -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

Index: rdiff_backup/fs_abilities.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/fs_abilities.py,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- rdiff_backup/fs_abilities.py        3 Jan 2009 23:31:39 -0000       1.66
+++ rdiff_backup/fs_abilities.py        7 Jan 2009 01:23:21 -0000       1.67
@@ -846,6 +846,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):