From: Dan Mick <dan.mick@inktank.com>
Date: Tue, 27 Aug 2013 20:37:14 +0000 (-0700)
Subject: ceph.in: add to $PATH if needed regardless of LD_LIBRARY_PATH state
X-Git-Tag: v0.68~9^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F548%2Fhead;p=ceph.git

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

Signed-off-by: Dan Mick <dan.mick@inktank.com>
---

diff --git a/src/ceph.in b/src/ceph.in
index ac356d80e757..320e4bd413fd 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