From 09e5812a237b966bc5b617840a9598286b104714 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Sat, 27 Mar 2021 18:39:24 +0100 Subject: [PATCH] Send info messages to stdout if an output file has been specified Fixes #1651 --- .../generate-domains-blocklist.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/utils/generate-domains-blocklist/generate-domains-blocklist.py b/utils/generate-domains-blocklist/generate-domains-blocklist.py index 4bad16d1..4344fd8d 100755 --- a/utils/generate-domains-blocklist/generate-domains-blocklist.py +++ b/utils/generate-domains-blocklist/generate-domains-blocklist.py @@ -20,6 +20,10 @@ except (ImportError, ModuleNotFoundError): URLLIB_NEW = True +log_info = sys.stderr +log_err = sys.stderr + + def parse_trusted_list(content): rx_comment = re.compile(r"^(#|$)") rx_inline_comment = re.compile(r"\s*#\s*[a-z0-9-].*$") @@ -99,7 +103,7 @@ def print_restricted_name(output_fd, name, time_restrictions): def load_from_url(url): - sys.stderr.write("Loading data from [{}]\n".format(url)) + log_info.write("Loading data from [{}]\n".format(url)) req = urllib.Request(url=url, headers={"User-Agent": "dnscrypt-proxy"}) trusted = False @@ -202,7 +206,7 @@ def blocklists_from_config_file( all_names |= names all_globs |= globs except Exception as e: - sys.stderr.write(str(e)) + log_err.write(str(e)) if not ignore_retrieval_failure: exit(1) @@ -323,7 +327,9 @@ args = argp.parse_args() whitelist = args.whitelist if whitelist: - print("The option to provide a set of names to exclude from the blocklist has been changed from -w to -a\r\n") + print( + "The option to provide a set of names to exclude from the blocklist has been changed from -w to -a\n" + ) argp.print_help() exit(1) @@ -332,6 +338,8 @@ allowlist = args.allowlist time_restricted = args.time_restricted ignore_retrieval_failure = args.ignore_retrieval_failure output_file = args.output_file +if output_file: + log_info = sys.stdout blocklists_from_config_file( conf, allowlist, time_restricted, ignore_retrieval_failure, output_file