From 929600d7f79a817ba2535d4e3c3e615852c571d6 Mon Sep 17 00:00:00 2001 From: Otto Winter Date: Thu, 24 Oct 2019 22:16:09 +0200 Subject: [PATCH] Fix merge --- script/ci-custom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/ci-custom.py b/script/ci-custom.py index 165cebf3f3..c6d53d0a69 100755 --- a/script/ci-custom.py +++ b/script/ci-custom.py @@ -5,7 +5,6 @@ import codecs import collections import fnmatch import os.path -import re import subprocess import sys import re @@ -263,6 +262,7 @@ def lint_constants_usage(): errors.append("Constant {} is defined in {} files. Please move all definitions of the " "constant to const.py (Uses: {})" "".format(highlight(constant), len(uses), ', '.join(uses))) + return errors def relative_cpp_search_text(fname, content):