diff options
author | Sage Weil <sage@inktank.com> | 2013-08-27 14:02:26 -0700 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2013-08-27 14:02:26 -0700 |
commit | ec297ec6606af4e5c2d3287332929498a60226d1 (patch) | |
tree | f01cd6fe747b439e743980576c6ee5a7b1c0e2dd | |
parent | c5b5ce120a8ce9116be52874dbbcc39adec48b5c (diff) | |
parent | 37850e1be676317fb15fa17b2c826010a90d572f (diff) | |
download | ceph-ec297ec6606af4e5c2d3287332929498a60226d1.tar.gz |
Merge pull request #548 from dmick/next
ceph.in: add to $PATH if needed regardless of LD_LIBRARY_PATH state
Reviewed-by: Sage Weil <sage@inktank.com>
-rwxr-xr-x | src/ceph.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ceph.in b/src/ceph.in index ac356d80e75..320e4bd413f 100755 --- a/src/ceph.in +++ b/src/ceph.in @@ -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 |