From f8a981b82968147ba877797f8bef651acc035f9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= Date: Thu, 31 May 2018 18:34:53 +0200 Subject: Revert the try to have clean progress information during update-* targets We want "make -s update-foo" to not output anything when there are no errors. --- Makefile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 363008f9f1..e293b3ae7b 100644 --- a/Makefile +++ b/Makefile @@ -30,11 +30,6 @@ include lib/*-releases.mk # _RELEASE: the release name for the security tracker # _SUBRELEASE: the sub-release identifier for the security tracker -Q=@ -ifneq ($(V),) -Q= -endif - all: $(PYTHON) bin/update-db data/security.db @@ -77,17 +72,15 @@ update-packages: $(foreach release,$(RELEASES),update-$(release)) define add_update_rule = .PHONY: update-$(1) update-$(1): - $$(Q)set -e; \ + set -e; \ prefix="$$($(1)_RELEASE)_$$($(1)_SUBRELEASE)"; \ dist="$$($(1)_DIST)"; \ mirror="$$($(1)_MIRROR)"; \ for section in main contrib non-free ; do \ - echo "Fetching $$$$mirror/dists/$$$$dist/$$$$section/source/Sources"; \ $$(PYTHON) bin/apt-update-file \ $$$$mirror/dists/$$$$dist/$$$$section/source/Sources \ data/packages/$$$${prefix}_$$$${section}_Sources ; \ for arch in $$($(1)_ARCHS) ; do \ - echo "Fetching $$$$mirror/dists/$$$$dist/$$$$section/binary-$$$$arch/Packages"; \ $$(PYTHON) bin/apt-update-file \ $$$$mirror/dists/$$$$dist/$$$$section/binary-$$$$arch/Packages \ data/packages/$$$${prefix}_$$$${section}_$$$${arch}_Packages ; \ -- cgit v1.2.3