[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/06/11 19:36:20

Modified files:
        .              : CHANGELOG rdiff-backup-statistics 

Log message:
        flush stdout before running other commands, and add a --quiet option

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.271&r2=1.272
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff-backup-statistics?cvsroot=rdiff-backup&r1=1.8&r2=1.9

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -b -r1.271 -r1.272
--- CHANGELOG   10 Jun 2008 13:14:52 -0000      1.271
+++ CHANGELOG   11 Jun 2008 19:36:20 -0000      1.272
@@ -1,6 +1,10 @@
 New in v1.1.16 (????/??/??)
 ---------------------------
 
+rdiff-backup-statistics enhancements suggested by James Marsh: flush stdout
+before running other commands, and add a --quiet option to suppress printing
+the "Processing statistics from session..." lines. (Andrew Ferguson)
+
 Don't set modification times for directories on Windows. Also, assume
 that user has access to all files on Windows since there is no support
 for getuid(). (Patch from Josh Nisly)

Index: rdiff-backup-statistics
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff-backup-statistics,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- rdiff-backup-statistics     11 Jun 2008 19:33:00 -0000      1.8
+++ rdiff-backup-statistics     11 Jun 2008 19:36:20 -0000      1.9
@@ -28,11 +28,12 @@
 end_time = None # ... and at or before this time (epoch seconds)
 min_ratio = .05 # report only files/directories over this number
 separator = "\n" # The line separator in file_statistics file
+quiet = False # Suppress the "Processing statistics from session ..." lines
 
 def parse_args():
-       global begin_time, end_time, min_ratio, separator
+       global begin_time, end_time, min_ratio, separator, quiet
        try: optlist, args = getopt.getopt(sys.argv[1:], "",
-                       ["begin-time=", "end-time=", "minimum-ratio=", 
"null-separator"])
+                       ["begin-time=", "end-time=", "minimum-ratio=", 
"null-separator", "quiet"])
        except getopt.error, e:
                sys.exit("Bad command line: " + str(e))
 
@@ -41,6 +42,7 @@
                elif opt == "--end-time": end_time = Time.genstrtotime(arg)
                elif opt == "--minimum-ratio": min_ratio = float(arg)
                elif opt == "--null-separator": separator = '\0'
+               elif opt == "--quiet": quiet = True
                else: assert 0
 
        if len(args) != 1:
@@ -56,6 +58,7 @@
        if len(sys.argv) == 3: tag = sys.argv[2]
 
 def system(cmd):
+       sys.stdout.flush()
        if os.system(cmd): sys.exit("Error running command '%s'\n" % (cmd,))
 
 
@@ -406,11 +409,12 @@
 
 def sum_fst(rp_pairs):
        """Add the file statistics given as list of (session_rp, file_rp) 
pairs"""
+       global quiet
        n = len(rp_pairs)
-       print "Processing statistics from session 1 of %d" % (n,)
+       if not quiet: print "Processing statistics from session 1 of %d" % (n,)
        total_fst = make_fst(*rp_pairs[0])
        for i in range(1, n):
-               print "Processing statistics from session %d of %d" % (i+1, n)
+               if not quiet: print "Processing statistics from session %d of 
%d" % (i+1, n)
                session_rp, filestat_rp = rp_pairs[i]
                fst = make_fst(session_rp, filestat_rp)
                total_fst += fst