From 6a112914aab749127ff210d1357ba5ed108b7a19 Mon Sep 17 00:00:00 2001 From: Zooko O'Whielacronx Date: Mon, 14 Apr 2008 06:52:21 -0700 Subject: [PATCH] setup: fix spacing in error output messages from makefile Looking over Brian's shoulder the other day, I saw a message that said "Please seedocs/install.html". Looking at the source code of the Makefile, it seems like it should say @echo "ERROR: Not all of Tahoe's dependencies are in place. Please see \ docs/install.html for help on installing dependencies." instead of its current: @echo "ERROR: Not all of Tahoe's dependencies are in place. Please see\ docs/install.html for help on installing dependencies." But, I remember changing this more than once in the past, so either there is a different version of make somewhere which interprets trailing backslashes differently, or someone (possibly me) has repeatedly gotten confused about this issue. Anyway, this time around, I'm trying: @echo "ERROR: Not all of Tahoe's dependencies are in place. Please see docs/install.html for help on installing dependencies." Even though it is > 80 chars. --- Makefile | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 589d19e8..6715ed75 100644 --- a/Makefile +++ b/Makefile @@ -125,8 +125,7 @@ endif signal-error-deps: @echo @echo - @echo "ERROR: Not all of Tahoe's dependencies are in place. Please see\ -docs/install.html for help on installing dependencies." + @echo "ERROR: Not all of Tahoe's dependencies are in place. Please see docs/install.html for help on installing dependencies." @echo @echo exit 1 @@ -142,8 +141,7 @@ signal-error-twisted-dep: signal-error-pywin32-dep: @echo @echo - @echo "ERROR: the pywin32 dependency is not in place. Please see docs/install.html for\ -help on installing dependencies." + @echo "ERROR: the pywin32 dependency is not in place. Please see docs/install.html for help on installing dependencies." @echo @echo exit 1 @@ -185,13 +183,11 @@ TEST=allmydata # suppress the ansi color sequences test: .built .checked-deps src/allmydata/_version.py - $(PP) \ - $(TRIAL) $(TRIALARGS) $(TEST) + $(PP) $(TRIAL) $(TRIALARGS) $(TEST) test-figleaf: .built .checked-deps rm -f .figleaf - $(PP) \ - $(TRIAL) --reporter=bwverbose-figleaf $(TEST) + $(PP) $(TRIAL) --reporter=bwverbose-figleaf $(TEST) figleaf-output: $(PP) \ @@ -224,8 +220,7 @@ upload-figleaf: endif .figleaf.el: .figleaf - $(PP) \ - $(PYTHON) misc/figleaf2el.py .figleaf src + $(PP) $(PYTHON) misc/figleaf2el.py .figleaf src pyflakes: $(PYTHON) -OOu `which pyflakes` src/allmydata |sort |uniq @@ -447,4 +442,3 @@ mac-dbg: .PHONY: stats-gatherer-run stats-gatherer-run: cd stats_gatherer && $(PP) $(PYTHON) ../src/allmydata/stats.py - -- 2.45.2