From: Michael Fritch <mfritch@suse.com>
Date: Tue, 12 May 2020 19:12:15 +0000 (-0600)
Subject: cephadm: return absolute path from pathify
X-Git-Tag: v16.1.0~2342^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F35030%2Fhead;p=ceph.git

cephadm: return absolute path from pathify

normalizes the user defined paths a bit better to avoid inconsistent
results with os.path.basename(), os.path.join(), etc.

For example:
$ cephadm shell --mount ~/

Signed-off-by: Michael Fritch <mfritch@suse.com>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 57d4b556d13d..b78758b49103 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -930,9 +930,8 @@ def read_config(fn):
 
 def pathify(p):
     # type: (str) -> str
-    if not p.startswith('/'):
-        return os.path.join(os.getcwd(), p)
-    return p
+    p = os.path.expanduser(p)
+    return os.path.abspath(p)
 
 def get_file_timestamp(fn):
     try: