فهرست منبع

Merge pull request #6858 from ThomasWaldmann/remove-scp-tilde-expansion-borg2

we remove scp style, also remove it for tilde expansion, fixes #6856
TW 2 سال پیش
والد
کامیت
b37f660d8b
1فایلهای تغییر یافته به همراه0 افزوده شده و 5 حذف شده
  1. 0 5
      src/borg/remote.py

+ 0 - 5
src/borg/remote.py

@@ -332,15 +332,10 @@ class RepositoryServer:  # pragma: no cover
     def _resolve_path(self, path):
     def _resolve_path(self, path):
         if isinstance(path, bytes):
         if isinstance(path, bytes):
             path = os.fsdecode(path)
             path = os.fsdecode(path)
-        # Leading slash is always present with URI (ssh://), but not with short-form (who@host:path).
         if path.startswith("/~/"):  # /~/x = path x relative to home dir
         if path.startswith("/~/"):  # /~/x = path x relative to home dir
             path = os.path.join(get_base_dir(), path[3:])
             path = os.path.join(get_base_dir(), path[3:])
-        elif path.startswith("~/"):
-            path = os.path.join(get_base_dir(), path[2:])
         elif path.startswith("/~"):  # /~username/x = relative to "user" home dir
         elif path.startswith("/~"):  # /~username/x = relative to "user" home dir
             path = os.path.expanduser(path[1:])
             path = os.path.expanduser(path[1:])
-        elif path.startswith("~"):
-            path = os.path.expanduser(path)
         elif path.startswith("/./"):  # /./x = path x relative to cwd
         elif path.startswith("/./"):  # /./x = path x relative to cwd
             path = path[3:]
             path = path[3:]
         return os.path.realpath(path)
         return os.path.realpath(path)