From c69c48c33b2808a1ecdcff9c9811379d5e2615f2 Mon Sep 17 00:00:00 2001 From: Devan Franchini Date: Thu, 20 Mar 2014 13:56:18 -0400 Subject: [PATCH] layman/{config, constants, output}.py: Adds notice level. The -q flag setting was being ignored by output.notice() calls. Adding note_level to the output.notice() function makes it so that the output will be quieted, if desired. X-Gentoo-Bug: 457726 X-Gentoo-Bug-URL: https://bugs.gentoo.org/457726 --- layman/config.py | 1 + layman/constants.py | 1 + layman/output.py | 19 ++++++++++++++++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/layman/config.py b/layman/config.py index 576ed05..bf33f50 100644 --- a/layman/config.py +++ b/layman/config.py @@ -228,6 +228,7 @@ class BareConfig(object): def _set_quietness(self, value): self._options['output'].set_info_level(value) self._options['output'].set_warn_level(value) + self._options['output'].set_note_level(value) def __getitem__(self, key): return self._get_(key) diff --git a/layman/constants.py b/layman/constants.py index 6f53de3..9a2af40 100644 --- a/layman/constants.py +++ b/layman/constants.py @@ -48,6 +48,7 @@ NOT_SUPPORTED_MSG = '*** You are lacking the necessary tools' +\ OFF = 0 WARN_LEVEL = 4 INFO_LEVEL = 4 +NOTE_LEVEL = 4 DEBUG_LEVEL = 4 DEBUG_VERBOSITY = 2 diff --git a/layman/output.py b/layman/output.py index b48531a..48b44a1 100644 --- a/layman/output.py +++ b/layman/output.py @@ -12,7 +12,7 @@ __version__ = "0.1" import sys -from layman.constants import codes, INFO_LEVEL, WARN_LEVEL, DEBUG_LEVEL, OFF +from layman.constants import codes, INFO_LEVEL, WARN_LEVEL, NOTE_LEVEL, DEBUG_LEVEL, OFF from layman.compatibility import encode @@ -25,6 +25,7 @@ class MessageBase(object): err = sys.stderr, info_level = INFO_LEVEL, warn_level = WARN_LEVEL, + note_level = NOTE_LEVEL, col = True, error_callback=None ): @@ -46,6 +47,9 @@ class MessageBase(object): # The higher the level the more information you will get self.info_lev = info_level + # The higher the level the more information you will get + self.note_lev = note_level + # Should the output be colored? self.color_func = None self.set_colorize(col) @@ -81,6 +85,10 @@ class MessageBase(object): self.warn_lev = warn_level + def set_note_level(self, note_level = NOTE_LEVEL): + self.note_lev = note_level + + def set_debug_level(self, debugging_level = DEBUG_LEVEL): self.debug_lev = debugging_level @@ -103,12 +111,13 @@ class Message(MessageBase): err = sys.stderr, info_level = INFO_LEVEL, warn_level = WARN_LEVEL, + note_level = NOTE_LEVEL, col = True, error_callback = None ): MessageBase.__init__(self, out, err, info_level, warn_level, - col, error_callback) + note_level, col, error_callback) ## Output Functions @@ -127,7 +136,11 @@ class Message(MessageBase): print >> self.std_out, self.color_func('yellow', 'DEBUG: ') + i - def notice (self, note): + def notice (self, note, level = NOTE_LEVEL): + + if level > self.note_lev: + return + print >> self.std_out, note -- 1.8.3.2