From f2a3f9a622613ec1575e70ac9fe9655b485d9a6d Mon Sep 17 00:00:00 2001 From: Soren Hansen Date: Wed, 8 Sep 2010 10:45:39 +0200 Subject: Make the scripts in bin/ detect if they're being run from a bzr checkout or an extracted release tarball or whatever and adjust PYTHONPATH accordingly. --- bin/nova-api | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'bin/nova-api') diff --git a/bin/nova-api b/bin/nova-api index a3ad5a0e1..ede09d38c 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -22,9 +22,19 @@ Tornado daemon for the main API endpoint. """ import logging +import os +import sys from tornado import httpserver from tornado import ioloop +# If ../nova/__init__.py exists, add ../ to Python search path, so that +# it will override what happens to be installed in /usr/(local/)lib/python... +possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), + os.pardir, + os.pardir)) +if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')): + sys.path.insert(0, possible_topdir) + from nova import flags from nova import server from nova import utils -- cgit