Imported Debian patch 4.0.5-6~numeezy

This commit is contained in:
Alexandre Ellert
2016-02-17 15:07:45 +01:00
committed by Mario Fetka
parent c44de33144
commit 10dfc9587b
1203 changed files with 53869 additions and 241462 deletions

View File

@@ -29,7 +29,7 @@ import sys
import re
import copy
from ipapython.log_manager import LogManager, parse_log_level
from log_manager import LogManager, parse_log_level
#-------------------------------------------------------------------------------
@@ -180,12 +180,12 @@ def standard_logging_setup(filename=None, verbose=False, debug=False,
file_handler = dict(name='file',
filename=filename,
filemode=filemode,
permission=0o600,
permission=0600,
level='debug',
format=LOGGING_FORMAT_STANDARD_FILE)
handlers.append(file_handler)
if 'console' in log_mgr.handlers:
if log_mgr.handlers.has_key('console'):
log_mgr.remove_handler('console')
level = 'error'
if verbose: