From 3fdb435be2d91eaa24c1a2507505a69ca6d3f8b9 Mon Sep 17 00:00:00 2001 From: Tim McCormack Date: Mon, 18 Sep 2023 12:32:18 -0400 Subject: [PATCH] build: Fix common-constraints override to prevent doubled comment (#33271) Sometimes this make target doubles or even triples the comment. I think this is due to a temporary failure in the wget call, which is then ignored and an additional comment is added onto the top. If this happens multiple times in a row, you get multiple additions. Removing the `|| touch` should fix this, and surface any errors that are happening. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8664111ebe..bc5a79712e 100644 --- a/Makefile +++ b/Makefile @@ -112,7 +112,7 @@ endef COMMON_CONSTRAINTS_TXT=requirements/common_constraints.txt .PHONY: $(COMMON_CONSTRAINTS_TXT) $(COMMON_CONSTRAINTS_TXT): - wget -O "$(@)" https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt || touch "$(@)" + wget -O "$(@)" https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt printf "$(COMMON_CONSTRAINTS_TEMP_COMMENT)" | cat - $(@) > temp && mv temp $(@) compile-requirements: export CUSTOM_COMPILE_COMMAND=make upgrade