From: Sage Weil <sage@inktank.com>
Date: Wed, 31 Jul 2013 06:08:58 +0000 (-0700)
Subject: ceph: developer mode: set PATH, too
X-Git-Tag: v0.67~40
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=00dc634451687756ef16f176753d0bd0ba385584;p=ceph.git

ceph: developer mode: set PATH, too

Otherwise the call to ceph-conf may fail if it is not installed on the
local machine.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/ceph.in b/src/ceph.in
index 6caef354a102..b9d3b04c94d8 100755
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -26,7 +26,7 @@ import sys
 
 MYPATH = os.path.abspath(__file__)
 MYDIR = os.path.dirname(MYPATH)
-DEVMODEMSG = '*** DEVELOPER MODE: setting PYTHONPATH and LD_LIBRARY_PATH'
+DEVMODEMSG = '*** DEVELOPER MODE: setting PATH, PYTHONPATH and LD_LIBRARY_PATH ***'
 
 if MYDIR.endswith('src') and \
    os.path.exists(os.path.join(MYDIR, '.libs')) and \
@@ -35,6 +35,7 @@ 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: