[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff-backup-statistics

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 08/01/06 18:35:32

Modified files:
        .              : CHANGELOG rdiff-backup-statistics 

Log message:
        Support quoted repositories in rdiff-backup-statistics

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.257&r2=1.258
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff-backup-statistics?cvsroot=rdiff-backup&r1=1.6&r2=1.7

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -b -r1.257 -r1.258
--- CHANGELOG   6 Jan 2008 02:13:22 -0000       1.257
+++ CHANGELOG   6 Jan 2008 18:35:32 -0000       1.258
@@ -1,6 +1,9 @@
 New in v1.1.16 (????/??/??)
 ---------------------------
 
+rdiff-backup-statistics now supports quoted repositories. Closes Savannah
+bug #21813. (Andrew Ferguson)
+
 Add EBADF to the list of recoverable errors when fsync() is called. This
 fixes an rdiff-backup error on AIX and IRIX. Closes Savannah bug #15839.
 (Fix from Peter O'Gorman)

Index: rdiff-backup-statistics
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff-backup-statistics,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- rdiff-backup-statistics     30 Dec 2005 06:50:47 -0000      1.6
+++ rdiff-backup-statistics     6 Jan 2008 18:35:32 -0000       1.7
@@ -22,7 +22,7 @@
 
 import os, sys, re, getopt
 from rdiff_backup import connection, regress, rpath, Globals, restore, \
-        Time, lazy
+        Time, lazy, FilenameMapping
 
 begin_time = None # Parse statistics at or after this time...
 end_time = None # ... and at or before this time (epoch seconds)
@@ -97,8 +97,8 @@
 
 def print_session_statistics(stat_rpaths):
        print "Session statistics:"
-       system("rdiff-backup --calculate-average " +
-                  " ".join([inc.path for inc in stat_rpaths.session_rps]))
+       system('rdiff-backup --calculate-average "' +
+                  " ".join([inc.path for inc in stat_rpaths.session_rps]) + 
'"')
 
 
 class FileStatisticsTree:
@@ -416,9 +416,19 @@
                total_fst += fst
        return total_fst
        
+def set_chars_to_quote():
+       ctq_rp = Globals.rbdir.append("chars_to_quote")
+       if ctq_rp.lstat():
+               Globals.chars_to_quote = ctq_rp.get_data()
+       if Globals.chars_to_quote:
+               Globals.must_escape_dos_devices = 0 # No DOS devices will be 
present
+               FilenameMapping.set_init_quote_vals()
+               Globals.rbdir = FilenameMapping.get_quotedrpath(Globals.rbdir)
+
 def Main():
        Time.setcurtime()
        parse_args()
+       set_chars_to_quote()    
        srp = StatisticsRPaths(Globals.rbdir)
        if not srp.combined_pairs: sys.exit("No matching sessions found")
        if len(srp.combined_pairs) == 1: fst = make_fst(*srp.combined_pairs[0])