Fix merge

This commit is contained in:
Otto Winter 2019-10-24 22:16:09 +02:00
parent 163d0c55ab
commit 929600d7f7
No known key found for this signature in database
GPG key ID: DB66C0BE6013F97E

View file

@ -5,7 +5,6 @@ import codecs
import collections import collections
import fnmatch import fnmatch
import os.path import os.path
import re
import subprocess import subprocess
import sys import sys
import re import re
@ -263,6 +262,7 @@ def lint_constants_usage():
errors.append("Constant {} is defined in {} files. Please move all definitions of the " errors.append("Constant {} is defined in {} files. Please move all definitions of the "
"constant to const.py (Uses: {})" "constant to const.py (Uses: {})"
"".format(highlight(constant), len(uses), ', '.join(uses))) "".format(highlight(constant), len(uses), ', '.join(uses)))
return errors
def relative_cpp_search_text(fname, content): def relative_cpp_search_text(fname, content):