Skip to content

M
mkimage-profiles
Commit 801455fe authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

build.mk: added Conflicts: to error filter

Just stumbled into that and (falsely) blamed vseleznv@! :(
parent 2f389cfc
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
lib/build.mk
View file @ 801455fe
......@@ -4,7 +4,7 @@ ANSI_FAIL ?= 1;31
MAX_LINES = 200
MAX_ERRORS = 5
GOTCHA := ^(((\*\* )?(E:|[Ee]rror|[Ww]arning).*)|(.* (FAILURE|FATAL|ERROR|conflicts|Depends:) .*)|(.* (Stop|failed|not found)\.)|(not allowed))$$
GOTCHA := ^(((\*\* )?(E:|[Ee]rror|[Ww]arning).*)|(.* (FAILURE|FATAL|ERROR|conflicts|Conflicts:|Depends:) .*)|(.* (Stop|failed|not found)\.)|(not allowed))$$
ifndef MKIMAGE_PROFILES
$(error this makefile is designed to be included in toplevel one)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment