summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AUTHORS1
-rw-r--r--keystone/controllers/version.py8
2 files changed, 5 insertions, 4 deletions
diff --git a/AUTHORS b/AUTHORS
index 7936b430..efaa4389 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -16,6 +16,7 @@ John Dickinson <me@not.mn>
John Eo <joon.eo@gmail.com>
Jorge L. Williams <jorge.williams@rackspace.com>
Josh Kearney <josh@jk0.org>
+Julien Danjou <julien.danjou@enovance.com>
Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Khaled Hussein <khaled.hussein@gmail.com>
Mark Gius <mgius7096@gmail.com>
diff --git a/keystone/controllers/version.py b/keystone/controllers/version.py
index d969a1ab..9b965fdf 100644
--- a/keystone/controllers/version.py
+++ b/keystone/controllers/version.py
@@ -1,12 +1,12 @@
import os
-import sys
from webob import Response
# 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))
+possible_topdir = os.path.normpath(os.path.join(os.path.abspath(__file__),
+ os.pardir,
+ os.pardir,
+ os.pardir))
from keystone import utils
from keystone.common import template, wsgi