mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-01-19 03:06:33 +00:00
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.
This commit is contained in:
parent
bab799297f
commit
3fab96493e
3
Makefile
3
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
|
||||
|
Loading…
Reference in New Issue
Block a user