From b41866f7db7d5351d9c8fb0c3dea124308c3d4d0 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Mon, 10 Oct 2011 15:10:22 +0200 Subject: [PATCH] [eit.commands] avoid using print_info(), print_warning() and print_error() when possible --- server/eit/commands/commit.py | 5 +++-- server/eit/commands/status.py | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/server/eit/commands/commit.py b/server/eit/commands/commit.py index a5c9eb2b6..337d3da92 100644 --- a/server/eit/commands/commit.py +++ b/server/eit/commands/commit.py @@ -87,8 +87,9 @@ class EitCommit(EitCommand): return 1 acquired = entropy.tools.acquire_entropy_locks(server) if not acquired: - print_error( - darkgreen(_("Another Entropy is currently running.")) + entropy_server.output( + darkgreen(_("Another Entropy is currently running.")), + level="error", importance=1 ) return 1 return self.__commit(server) diff --git a/server/eit/commands/status.py b/server/eit/commands/status.py index 44ab7812c..73358fc3a 100644 --- a/server/eit/commands/status.py +++ b/server/eit/commands/status.py @@ -16,7 +16,7 @@ import argparse from entropy.const import etpConst from entropy.i18n import _ from entropy.exceptions import PermissionDenied -from entropy.output import print_info, print_error, darkgreen, \ +from entropy.output import print_error, darkgreen, \ teal, brown, darkred, bold, purple, blue from text_tools import print_table @@ -48,7 +48,6 @@ class EitStatus(EitCommand): try: nsargs = parser.parse_args(self._args) except IOError as err: - print_error("error: %s" % (err.strerror,)) return parser.print_help, [] return self._status, [nsargs.repo] @@ -67,8 +66,9 @@ class EitStatus(EitCommand): return 1 acquired = entropy.tools.acquire_entropy_locks(server) if not acquired: - print_error( - darkgreen(_("Another Entropy is currently running.")) + entropy_server.output( + darkgreen(_("Another Entropy is currently running.")), + level="error", importance=1 ) return 1 return self.__status(server) @@ -126,7 +126,7 @@ class EitStatus(EitCommand): print_table(toc) del toc[:] - print_info("") + entropy_server.output("") def _get_spm_slot_repo(pkg_atom): try: