startstop_node.py: find twistd in our supportlib if we had to build Twisted as a setuptools dependency. This is a form of cgalvan's #505 patch, simplified because now 'setup.py trial' takes care of sys.path and PYTHONPATH

This commit is contained in:
Brian Warner 2008-09-11 19:51:38 -07:00
parent 39552404d7
commit f00d1961d2

View File

@ -53,6 +53,21 @@ def do_start(basedir, profile=False, out=sys.stdout, err=sys.stderr):
nodetype = "unknown (%s)" % tac
cmd = find_exe.find_exe('twistd')
if not cmd:
# If 'twistd' wasn't on $PATH, maybe we're running from source and
# Twisted was built as one of our dependencies. If so, we're at
# BASEDIR/src/allmydata/scripts/startstop_node.py, and it's at
# BASEDIR/support/bin/twistd
up = os.path.dirname
TAHOEDIR = up(up(up(up(os.path.abspath(__file__)))))
bindir = os.path.join(TAHOEDIR, "support/bin")
maybe = os.path.join(bindir, "twistd")
if os.path.exists(maybe):
cmd = [maybe]
oldpath = os.environ.get("PATH", "").split(os.pathsep)
os.environ["PATH"] = os.pathsep.join(oldpath + [bindir])
# sys.path and $PYTHONPATH are taken care of by the extra code in
# 'setup.py trial'
if not cmd:
print "Can't find twistd (it comes with Twisted). Aborting."
sys.exit(1)