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

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 07/07/06 21:47:20

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : manage.py restore.py 

Log message:
        Handle quoted current_mirror markers and clean-up the listing of
        increments with quoted names.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.219&r2=1.220
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/manage.py?cvsroot=rdiff-backup&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/restore.py?cvsroot=rdiff-backup&r1=1.58&r2=1.59

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -b -r1.219 -r1.220
--- CHANGELOG   20 Jun 2007 14:03:32 -0000      1.219
+++ CHANGELOG   6 Jul 2007 21:47:20 -0000       1.220
@@ -1,6 +1,9 @@
 New in v1.1.12 (????/??/??)
 ---------------------------
 
+Handle quoted current_mirror markers and clean-up the listing of
+increments with quoted names. (Andrew Ferguson)
+
 Warn if file modification time is before 1970. (Andrew Ferguson)
 
 

Index: rdiff_backup/manage.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/manage.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- rdiff_backup/manage.py      19 Nov 2005 03:58:14 -0000      1.11
+++ rdiff_backup/manage.py      6 Jul 2007 21:47:20 -0000       1.12
@@ -21,7 +21,7 @@
 
 from __future__ import generators
 from log import Log
-import Globals, Time, static, statistics, restore, selection
+import Globals, Time, static, statistics, restore, selection, FilenameMapping
 
 
 class ManageException(Exception): pass
@@ -70,7 +70,8 @@
        result = ["Found %d increments:" % len(incpairs)]
        for time, inc in incpairs:
                result.append("    %s   %s" %
-                                         (inc.dirsplit()[1], 
Time.timetopretty(time)))
+                                         
(FilenameMapping.unquote(inc.dirsplit()[1]),
+                                          Time.timetopretty(time)))
        result.append("Current mirror: %s" % Time.timetopretty(mirror_time))
        return "\n".join(result)
 

Index: rdiff_backup/restore.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/restore.py,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- rdiff_backup/restore.py     3 Feb 2007 17:32:27 -0000       1.58
+++ rdiff_backup/restore.py     6 Jul 2007 21:47:20 -0000       1.59
@@ -21,7 +21,7 @@
 
 from __future__ import generators
 import tempfile, os, cStringIO
-import static, rorpiter
+import static, rorpiter, FilenameMapping
 
 class RestoreError(Exception): pass
 
@@ -40,6 +40,7 @@
 def get_inclist(inc_rpath):
        """Returns increments with given base"""
        dirname, basename = inc_rpath.dirsplit()
+       basename = FilenameMapping.unquote(basename)
        parent_dir = inc_rpath.__class__(inc_rpath.conn, dirname, ())
        if not parent_dir.isdir(): return [] # inc directory not created yet
        index = inc_rpath.index
@@ -47,7 +48,8 @@
        inc_list = []
        for filename in parent_dir.listdir():
                inc = parent_dir.append(filename)
-               if inc.isincfile() and inc.getincbase_str() == basename:
+               if inc.isincfile() and FilenameMapping.unquote(
+                                                          
inc.getincbase_str()) == basename:
                        inc_list.append(inc)
        return inc_list