openstack
/
keystone
Code Issues Proposed changes

Fix thinko in keystone-all sys.path hack 

We shouldn't be looking for keystone-all/__init__.py

Change-Id: I833342cbc3d0fff3168d31d72d1c7e8b029e32fd
This commit is contained in:
Mark McLoughlin 2012-02-22 20:56:51 +00:00
parent 9742dc0673
commit 13dfd219c5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/keystone-all
View File

@ -6,13 +6,13 @@ import logging
import os
import sys
# If ../../keystone/__init__.py exists, add ../ to Python search path, so that
# If ../keystone/__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,
'keystone-all',
'keystone',
'__init__.py')):
sys.path.insert(0, possible_topdir)

2
bin/keystone-manage
View File

@ -3,7 +3,7 @@
import os
import sys
# If ../../keystone/__init__.py exists, add ../ to Python search path, so that
# If ../keystone/__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,