[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/11/12 21:37:29

Modified files:
        .              : CHANGELOG rdiff-backup-statistics 

Log message:
        Print nicer error messages in rdiff-backup-statistics

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.320&r2=1.321
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff-backup-statistics?cvsroot=rdiff-backup&r1=1.9&r2=1.10

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -b -r1.320 -r1.321
--- CHANGELOG   12 Nov 2008 19:02:02 -0000      1.320
+++ CHANGELOG   12 Nov 2008 21:37:29 -0000      1.321
@@ -1,6 +1,9 @@
 New in v1.2.3 (????/??/??)
 ---------------------------
 
+Print nicer error messages in rdiff-backup-statistics (without tracebacks).
+Closes Ubuntu bug #292586. (Andrew Ferguson)
+
 Properly handle EINVAL "Invalid argument" errors when setting extended
 attributes. Thanks to Kevin Fenzi for reporting the issue. (Andrew Ferguson)
 

Index: rdiff-backup-statistics
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff-backup-statistics,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- rdiff-backup-statistics     11 Jun 2008 19:36:20 -0000      1.9
+++ rdiff-backup-statistics     12 Nov 2008 21:37:29 -0000      1.10
@@ -22,7 +22,7 @@
 
 import os, sys, re, getopt
 from rdiff_backup import connection, regress, rpath, Globals, restore, \
-        Time, lazy, FilenameMapping
+        Time, lazy, FilenameMapping, robust
 
 begin_time = None # Parse statistics at or after this time...
 end_time = None # ... and at or before this time (epoch seconds)
@@ -443,5 +443,20 @@
        fst.print_top_dirs("increment size", lambda fs: fs.incsize)
        fst.print_top_dirs("number of files changed", lambda fs: fs.changed)
 
-if __name__ == '__main__': Main()
+def error_check_Main():
+       """Run Main on arglist, suppressing stack trace for routine errors"""
+       try:
+               Main()
+       except SystemExit:
+               raise
+       except KeyboardInterrupt:
+               print "User abort"
+       except (Exception, KeyboardInterrupt), exc:
+               if robust.catch_error(exc):
+                       print exc
+               else:
+                       raise
+
+
+if __name__ == '__main__': error_check_Main()