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

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 07/07/07 22:43:34

Modified files:
        rdiff_backup   : restore.py manage.py 

Log message:
        Bugfixes for when Globals.chars_to_quote is None

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/restore.py?cvsroot=rdiff-backup&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/manage.py?cvsroot=rdiff-backup&r1=1.12&r2=1.13

Patches:
Index: restore.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/restore.py,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- restore.py  6 Jul 2007 21:47:20 -0000       1.59
+++ restore.py  7 Jul 2007 22:43:34 -0000       1.60
@@ -40,7 +40,7 @@
 def get_inclist(inc_rpath):
        """Returns increments with given base"""
        dirname, basename = inc_rpath.dirsplit()
-       basename = FilenameMapping.unquote(basename)
+       if Globals.chars_to_quote: 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
@@ -48,8 +48,7 @@
        inc_list = []
        for filename in parent_dir.listdir():
                inc = parent_dir.append(filename)
-               if inc.isincfile() and FilenameMapping.unquote(
-                                                          
inc.getincbase_str()) == basename:
+               if inc.isincfile() and inc.getincbase_str() == basename:
                        inc_list.append(inc)
        return inc_list
 

Index: manage.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/manage.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- manage.py   6 Jul 2007 21:47:20 -0000       1.12
+++ manage.py   7 Jul 2007 22:43:34 -0000       1.13
@@ -68,10 +68,15 @@
        incpairs.sort()
 
        result = ["Found %d increments:" % len(incpairs)]
+       if Globals.chars_to_quote:
        for time, inc in incpairs:
                result.append("    %s   %s" %
                                          
(FilenameMapping.unquote(inc.dirsplit()[1]),
                                           Time.timetopretty(time)))
+       else:
+               for time, inc in incpairs:
+                       result.append("    %s   %s" %
+                                                 (inc.dirsplit()[1], 
Time.timetopretty(time)))
        result.append("Current mirror: %s" % Time.timetopretty(mirror_time))
        return "\n".join(result)