[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/eas_acls.py...

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 08/12/19 14:59:34

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : eas_acls.py fs_abilities.py 

Log message:
        Support comments in rdiff-backup's ACL files and quote the quoting 
character
        properly if user changed it.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.330&r2=1.331
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/eas_acls.py?cvsroot=rdiff-backup&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/fs_abilities.py?cvsroot=rdiff-backup&r1=1.59&r2=1.60

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -b -r1.330 -r1.331
--- CHANGELOG   19 Dec 2008 03:07:18 -0000      1.330
+++ CHANGELOG   19 Dec 2008 14:59:34 -0000      1.331
@@ -1,6 +1,9 @@
 New in v1.2.3 (????/??/??)
 ---------------------------
 
+Support comments in rdiff-backup's ACL files and quote the quoting character
+properly if user changed it. (Patch from Oliver Mulatz)
+
 Print a more helpful error message if we cannot read the backup destination.
 Closes Ubuntu bug #292586 (again). (Andrew Ferguson)
 

Index: rdiff_backup/eas_acls.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/eas_acls.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- rdiff_backup/eas_acls.py    13 Nov 2008 02:08:30 -0000      1.41
+++ rdiff_backup/eas_acls.py    19 Dec 2008 14:59:34 -0000      1.42
@@ -229,7 +229,7 @@
                """Set self.entry_list and self.default_entry_list from text"""
                self.entry_list, self.default_entry_list = [], []
                for line in text.split('\n'):
-                       comment_pos = text.find('#')
+                       comment_pos = line.find('#')
                        if comment_pos >= 0: line = line[:comment_pos]
                        line = line.strip()
                        if not line: continue

Index: rdiff_backup/fs_abilities.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/fs_abilities.py,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- rdiff_backup/fs_abilities.py        18 Dec 2008 00:44:24 -0000      1.59
+++ rdiff_backup/fs_abilities.py        19 Dec 2008 14:59:34 -0000      1.60
@@ -742,7 +742,8 @@
                        # Quote ", *, /, :, <, >, ?, \, |, and 127 (DEL)
                        ctq.append('\"*/:<>?\\\\|\177')
 
-               if ctq: ctq.append(';') # Quote quoting char if quoting anything
+               # Quote quoting char if quoting anything
+               if ctq: ctq.append(Globals.quoting_char)
                return "".join(ctq)
 
        def compare_ctq_file(self, rbdir, suggested_ctq, force):