From 0e3d04cb968cce9e031cff0cf0fc645fa02a030b Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sun, 23 Jan 2011 16:05:39 +0100 Subject: [PATCH] [equo] improve error messages handling in text_rescue._database_check --- client/text_rescue.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/client/text_rescue.py b/client/text_rescue.py index afd57bc8f..9ba847511 100644 --- a/client/text_rescue.py +++ b/client/text_rescue.py @@ -721,7 +721,10 @@ def _database_check(entropy_client): def client_repository_sanity_check(): entropy_client.output( - darkred(_("Sanity Check") + ": " + _("system database")), + "%s: %s" % ( + brown(_("Sanity Check")), + darkgreen(_("installed packages repository")), + ), importance = 2, level = "warning" ) @@ -754,27 +757,28 @@ def _database_check(entropy_client): ) try: entropy_client.installed_repository().getPackageData(x) - except Exception as e: + except Exception as err: entropy.tools.print_traceback() errors = True entropy_client.output( - darkred(_("Errors on package id %s, error: %s")) % (x, e), + "%s: %s" % ( + darkred(_("Error checking package")), + err, + ), importance = 0, level = "warning" ) if not errors: - t = _("Sanity Check") + ": %s" % (bold(_("PASSED")),) entropy_client.output( - darkred(t), + "%s: %s" % (brown(_("Sanity Check")), bold(_("passed"))), importance = 2, level = "warning" ) return 0 else: - t = _("Sanity Check") + ": %s" % (bold(_("CORRUPTED")),) entropy_client.output( - darkred(t), + "%s: %s" % (brown(_("Sanity Check")), bold(_("corrupted"))), importance = 2, level = "warning" )