[Rdiff-backup-commits] Changes to rdiff-backup/rdiff_backup/log.py

[Ben Escoto]

Index: rdiff-backup/rdiff_backup/log.py
diff -u rdiff-backup/rdiff_backup/log.py:1.20 
rdiff-backup/rdiff_backup/log.py:1.21
--- rdiff-backup/rdiff_backup/log.py:1.20       Sat Nov 12 05:39:20 2005
+++ rdiff-backup/rdiff_backup/log.py    Sat Nov 19 03:10:03 2005
@@ -156,9 +156,9 @@
                assert no_fatal_message == 0 or no_fatal_message == 1
                if no_fatal_message: prefix_string = ""
                else: prefix_string = "Fatal Error: "
-               self(prefix_string + message, 1)
-               import Main
-               Main.cleanup()
+               self.log_to_term(prefix_string + message, 1)
+               #import Main
+               #Main.cleanup()
                sys.exit(errlevel)
 
        def exception_to_string(self, arglist = []):
@@ -182,9 +182,12 @@
                if (only_terminal == 0 or
                        (only_terminal == 1 and self.log_file_open)):
                        logging_func = self.__call__
-               else: logging_func = self.log_to_term
+               else:
+                       logging_func = self.log_to_term
+                       if verbosity >= self.term_verbosity: return
 
                logging_func(self.exception_to_string(), verbosity)
+
 
 Log = Logger()