commit: 988f43379698cd76e8883a6bfffff0506a1b128d Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> AuthorDate: Sat Oct 10 05:59:09 2015 +0000 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> CommitDate: Sun Oct 11 05:56:25 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=988f4337
resume: convert to log module The AutoResumeError exception wasn't actually used as an exception -- it was never raised, only printed. Throw it away in place of a plain log message. catalyst/base/resume.py | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/catalyst/base/resume.py b/catalyst/base/resume.py index 443b46d..99d8abc 100644 --- a/catalyst/base/resume.py +++ b/catalyst/base/resume.py @@ -12,27 +12,13 @@ set, unset, is_set, is_unset, enabled, clear_all ''' import os -import sys -import traceback from snakeoil import fileutils +from catalyst import log from catalyst.fileops import ensure_dirs, pjoin, listdir_files, clear_dir -class AutoResumeError(Exception): - def __init__(self, message, print_traceback=False): - if message: - if print_traceback: - (_type, value) = sys.exc_info()[:2] - if value!=None: - print - print "Traceback values found. listing..." - print traceback.print_exc(file=sys.stdout) - print "!!! catalyst: AutoResumeError " + message - print - - class AutoResume(object): '''Class for tracking and handling all aspects of the autoresume option and related files. @@ -73,7 +59,7 @@ class AutoResume(object): fileutils.touch(fname) self._points[point] = fname except Exception as e: - print AutoResumeError(str(e)) + log.error('AutoResumeError: %s', e) return False return True @@ -91,7 +77,7 @@ class AutoResume(object): if data and no_lf: data = data.replace('\n', '') except OSError as e: - print AutoResumeError(str(e)) + log.error('AutoResumeError: %s', e) return None return data return None @@ -109,7 +95,7 @@ class AutoResume(object): os.unlink(self._points[point]) self._points.pop(point) except Exception as e: - print AutoResumeError(str(e)) + log.error('AutoResumeError: %s', e) return False return True