diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-23 00:28:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-23 00:28:29 +0000 |
| commit | d671b2f1ed1c8a7793f3d7cb52d6679b97cd160e (patch) | |
| tree | 56f9430192fa2b0dd91eeb8e66eecf226e385cdc | |
| parent | c64aeb725225388eccc6a636d50ee626f35cc928 (diff) | |
| parent | 13dfd219c53edad405008a2a149c14ad6f780800 (diff) | |
| download | keystone-d671b2f1ed1c8a7793f3d7cb52d6679b97cd160e.tar.gz keystone-d671b2f1ed1c8a7793f3d7cb52d6679b97cd160e.tar.xz keystone-d671b2f1ed1c8a7793f3d7cb52d6679b97cd160e.zip | |
Merge "Fix thinko in keystone-all sys.path hack"
| -rwxr-xr-x | bin/keystone-all | 4 | ||||
| -rwxr-xr-x | bin/keystone-manage | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/keystone-all b/bin/keystone-all index 7645a949..1402b92d 100755 --- a/bin/keystone-all +++ b/bin/keystone-all @@ -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) diff --git a/bin/keystone-manage b/bin/keystone-manage index e551c47e..b440ad15 100755 --- a/bin/keystone-manage +++ b/bin/keystone-manage @@ -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, |