RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-15 07:23:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #548 from dmick/next

Browse Source 
ceph.in: add to $PATH if needed regardless of LD_LIBRARY_PATH state

Reviewed-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2013-08-27 14:02:26 -07:00
commit ec297ec660
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ceph.in
View File

@ -35,7 +35,6 @@ if MYDIR.endswith('src') and \
if 'LD_LIBRARY_PATH' in os.environ:
if MYLIBPATH not in os.environ['LD_LIBRARY_PATH']:
os.environ['LD_LIBRARY_PATH'] += ':' + MYLIBPATH
os.environ['PATH'] += ':' + MYDIR
print >> sys.stderr, DEVMODEMSG
os.execvp('python', ['python'] + sys.argv)
else:
@ -43,6 +42,8 @@ if MYDIR.endswith('src') and \
print >> sys.stderr, DEVMODEMSG
os.execvp('python', ['python'] + sys.argv)
sys.path.insert(0, os.path.join(MYDIR, 'pybind'))
if MYDIR not in os.environ['PATH']:
os.environ['PATH'] += ':' + MYDIR
import argparse
import errno