Commit a2dc1b25 authored by owsla's avatar owsla

Support quoted repositories in rdiff-backup-statistics


git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup@869 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
parent 4a6db780
New in v1.1.16 (????/??/??) 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 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. fixes an rdiff-backup error on AIX and IRIX. Closes Savannah bug #15839.
(Fix from Peter O'Gorman) (Fix from Peter O'Gorman)
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
import os, sys, re, getopt import os, sys, re, getopt
from rdiff_backup import connection, regress, rpath, Globals, restore, \ from rdiff_backup import connection, regress, rpath, Globals, restore, \
Time, lazy Time, lazy, FilenameMapping
begin_time = None # Parse statistics at or after this time... begin_time = None # Parse statistics at or after this time...
end_time = None # ... and at or before this time (epoch seconds) end_time = None # ... and at or before this time (epoch seconds)
...@@ -97,8 +97,8 @@ class StatisticsRPaths: ...@@ -97,8 +97,8 @@ class StatisticsRPaths:
def print_session_statistics(stat_rpaths): def print_session_statistics(stat_rpaths):
print "Session statistics:" print "Session statistics:"
system("rdiff-backup --calculate-average " + system('rdiff-backup --calculate-average "' +
" ".join([inc.path for inc in stat_rpaths.session_rps])) " ".join([inc.path for inc in stat_rpaths.session_rps]) + '"')
class FileStatisticsTree: class FileStatisticsTree:
...@@ -415,10 +415,20 @@ def sum_fst(rp_pairs): ...@@ -415,10 +415,20 @@ def sum_fst(rp_pairs):
fst = make_fst(session_rp, filestat_rp) fst = make_fst(session_rp, filestat_rp)
total_fst += fst total_fst += fst
return total_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(): def Main():
Time.setcurtime() Time.setcurtime()
parse_args() parse_args()
set_chars_to_quote()
srp = StatisticsRPaths(Globals.rbdir) srp = StatisticsRPaths(Globals.rbdir)
if not srp.combined_pairs: sys.exit("No matching sessions found") if not srp.combined_pairs: sys.exit("No matching sessions found")
if len(srp.combined_pairs) == 1: fst = make_fst(*srp.combined_pairs[0]) if len(srp.combined_pairs) == 1: fst = make_fst(*srp.combined_pairs[0])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment