mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-05-05 11:59:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

munkicommon.display_warning and munkicommon.display_error now only write to log if munkicommon.verbose < 1

Browse Source
This commit is contained in:
Greg Neagle
2011-12-21 08:39:30 -08:00
parent 19b4a0bbc7
commit 820a231e78
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/munkilib/munkicommon.py
+4 -2
View File
@@ -394,7 +394,8 @@ def display_warning(msg, *args):
"""
msg = concat_log_message(msg, *args)
warning = 'WARNING: %s' % msg
print >> sys.stderr, warning.encode('UTF-8')
if verbose > 0:
print >> sys.stderr, warning.encode('UTF-8')
log(warning)
# append this warning to our warnings log
log(warning, 'warnings.log')
@@ -417,7 +418,8 @@ def display_error(msg, *args):
"""
msg = concat_log_message(msg, *args)
errmsg = 'ERROR: %s' % msg
print >> sys.stderr, errmsg.encode('UTF-8')
if verbose > 0:
print >> sys.stderr, errmsg.encode('UTF-8')
log(errmsg)
# append this error to our errors log
log(errmsg, 'errors.log')