From 3fab96493ef8802d96928a893f7ff420e87b8647 Mon Sep 17 00:00:00 2001 From: Zooko O'Whielacronx Date: Wed, 3 Sep 2008 10:18:37 -0700 Subject: [PATCH] setup: don't assert that trial is present when the Makefile is evaluated This should fix #506, but it means that if (for some weird reason) Twisted can't be auto-installed and the find_trial.py script doesn't work, the user will get a weird failure message instead of a clean failure message explaining that trial couldn't be found. Oh well. Chris Galvan is working on a much nicer fix to all these issues -- see #505. --- Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile b/Makefile index df24a954..23855910 100644 --- a/Makefile +++ b/Makefile @@ -64,9 +64,6 @@ PATH := $(subst ',,$(PATH)) # ' " # emacs syntax-highlighter gets confused by the bare quotes above TRIALCMD = $(shell PATH="$(PATH):${PWD}/support/bin" $(PP) $(PYTHON) misc/find_trial.py) -ifeq ($(TRIALCMD),) -$(error Could not find trial. It comes with twisted.) -endif TRIAL=PATH="$(PATH):${PWD}/support/bin" PYTHONUNBUFFERED=1 $(TRIALCMD) --rterrors $(REACTOROPT) $(TRIALOPT) .PHONY: make-version build -- 2.45.2