From bc69d010e5b4d55662f0af02f7034a2ab4020dff Mon Sep 17 00:00:00 2001 From: Jerry Date: Fri, 4 Jun 2021 10:02:02 +0800 Subject: [PATCH] release v0.1.5 fix logging issue --- setup.py | 2 +- src/pacroller/main.py | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index e6aee87..debc879 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh: setuptools.setup( name="pacroller", - version="0.1.4", + version="0.1.5", author="Jerry Xiao", author_email="pacroller@mail.jerryxiao.cc", description="unattended upgrade for archlinux", diff --git a/src/pacroller/main.py b/src/pacroller/main.py index 8a5390f..1391da1 100644 --- a/src/pacroller/main.py +++ b/src/pacroller/main.py @@ -272,10 +272,11 @@ def main() -> None: default='auto', help='allow interactive questions', metavar="auto / on / off ") args = parser.parse_args() - if args.debug: - logging.basicConfig(level=logging.DEBUG, format='%(asctime)s - %(module)s - %(funcName)s - %(levelname)s - %(message)s') - else: - logging.basicConfig(level=logging.INFO, format='%(levelname)s - %(message)s') + _log_format = '%(asctime)s - %(module)s - %(funcName)s - %(levelname)s - %(message)s' if args.debug else '%(levelname)s - %(message)s' + logging.basicConfig(level=logging.DEBUG, format=_log_format) + if not args.debug: + assert len(logger.handlers) == 1 + logger.handlers[0].setLevel(logging.INFO) locale_set() interactive = args.interactive == "on" or not (args.interactive == 'off' or not isatty(0)) logger.debug(f"interactive questions {'enabled' if interactive else 'disabled'}")