~rlane/nova/lp773690

« back to all changes in this revision

Viewing changes to bin/nova-compute

  • Committer: rlane at wikimedia
  • Date: 2011-04-29 22:30:40 UTC
  • mfrom: (382.1.655 nova)
  • Revision ID: rlane@wikimedia.org-20110429223040-i0x3ds9eqwrabyru
MergeĀ fromĀ trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
28
28
 
29
29
# If ../nova/__init__.py exists, add ../ to Python search path, so that
30
30
# it will override what happens to be installed in /usr/(local/)lib/python...
31
 
possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 
31
POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
32
32
                                   os.pardir,
33
33
                                   os.pardir))
34
 
if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
35
 
    sys.path.insert(0, possible_topdir)
 
34
if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')):
 
35
    sys.path.insert(0, POSSIBLE_TOPDIR)
36
36
 
37
37
gettext.install('nova', unicode=1)
38
38