From: Sage Weil <sage@redhat.com>
Date: Fri, 25 Oct 2019 02:25:59 +0000 (-0500)
Subject: ceph-daemon: fix pathify (fix shell --config/--keyring)
X-Git-Tag: v15.1.0~1158^2~4
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=75016caba5642011f8c3b321bcde5b36680d7c95;p=ceph-ci.git

ceph-daemon: fix pathify (fix shell --config/--keyring)

The relative path works on one of my machines but not my laptop; the
full CWD works everywhere.  This is presumably better anyway!

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

diff --git a/src/ceph-daemon b/src/ceph-daemon
index 6d64d9c740c..4d079199bec 100755
--- a/src/ceph-daemon
+++ b/src/ceph-daemon
@@ -147,8 +147,8 @@ def call_throws(command, **kwargs):
 ##################################
 
 def pathify(p):
-    if '/' not in p:
-        return './' + p
+    if not p.startswith('/'):
+        return os.path.join(os.getcwd(), p)
     return p
 
 def get_hostname():