]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: return absolute path from pathify
authorMichael Fritch <mfritch@suse.com>
Tue, 12 May 2020 19:12:15 +0000 (13:12 -0600)
committerSebastian Wagner <sebastian.wagner@suse.com>
Thu, 21 May 2020 21:33:18 +0000 (23:33 +0200)
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>
(cherry picked from commit 669840abc037fc8c49255a68bebae9a8279eac86)

src/cephadm/cephadm

index 205a476fdd76bb193c9f51ef924b0a3f7acdf4da..75f0ed6bf7a285d893d185e475f739ac5012e5a9 100755 (executable)
@@ -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: