Skip to content

Commit

Permalink
Fix looking for config files.
Browse files Browse the repository at this point in the history
- Fixes bug 966643.

Change-Id: I1e2a4d7e1765e4742bd501c4d381d94b6b7585e6
  • Loading branch information
chmouel committed Mar 28, 2012
1 parent 9cf91c9 commit 34e9a97
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion bin/keystone-all
Expand Up @@ -8,7 +8,7 @@ import sys

# 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]),
possible_topdir = os.path.normpath(os.path.join(os.path.abspath(__file__),
os.pardir,
os.pardir))
if os.path.exists(os.path.join(possible_topdir,
Expand Down Expand Up @@ -60,6 +60,11 @@ if __name__ == '__main__':
if CONF.debug:
CONF.log_opt_values(logging.getLogger(CONF.prog), logging.DEBUG)

if not CONF.config_file:
print "No config files could be found."
CONF.print_help()
sys.exit(1)

options = deploy.appconfig('config:%s' % CONF.config_file[0])

servers = []
Expand Down

0 comments on commit 34e9a97

Please sign in to comment.