From 59b4e78f65663db6f94a84b642bba3c8e24ec144 Mon Sep 17 00:00:00 2001 From: Romain Bignon Date: Thu, 2 Feb 2012 17:17:57 +0100 Subject: [PATCH] add IProgress.error() to allow application to handle errors --- weboob/core/repositories.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/weboob/core/repositories.py b/weboob/core/repositories.py index 2d97ddee88..965344d402 100644 --- a/weboob/core/repositories.py +++ b/weboob/core/repositories.py @@ -355,6 +355,9 @@ class IProgress: def progress(self, percent, message): print '=== [%3.0f%%] %s' % (percent*100, message) + def error(self, message): + print >>sys.stderr, 'ERROR: %s' % message + class ModuleInstallError(Exception): pass @@ -513,7 +516,7 @@ def update(self, progress=IProgress()): line = line.strip() % {'version': self.version} m = re.match('(file|https?)://.*', line) if m: - print 'Getting %s' % line + progress.progress(0.0, 'Getting %s' % line) repository = Repository(line) filename = self.url2filename(repository.url) prio_filename = '%02d-%s' % (len(self.repositories), filename) @@ -524,10 +527,10 @@ def update(self, progress=IProgress()): if gpgv: repository.retrieve_keyring(keyring_path) else: - print >>sys.stderr, 'Cannot find gpgv to check for repository authenticity.' - print >>sys.stderr, 'You should install GPG for better security.' + progress.error('Cannot find gpgv to check for repository authenticity.\n' + 'You should install GPG for better security.') except RepositoryUnavailable, e: - print >>sys.stderr, 'Error: %s' % e + progress.error('Unable to load repository: %s' % e) else: self.repositories.append(repository) -- GitLab