From 333663c39c6a966912a15a00d98f309484ca5f0a Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Wed, 2 Oct 2024 18:46:01 +0200 Subject: [PATCH 1/2] Location.canonical_path: fix protocol, see #8446 % borg repo-info Location: rclone://None/./pcloud:justtesting ... --- src/borg/helpers/parseformat.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/borg/helpers/parseformat.py b/src/borg/helpers/parseformat.py index 171e1462d..f4d028bd7 100644 --- a/src/borg/helpers/parseformat.py +++ b/src/borg/helpers/parseformat.py @@ -616,7 +616,8 @@ class Location: path = "/./" + self.path # /./x = path x relative to cwd else: path = self.path - return "ssh://{}{}{}{}".format( + return "{}://{}{}{}{}".format( + self.proto if self.proto else "???", f"{self.user}@" if self.user else "", self._host, # needed for ipv6 addrs f":{self.port}" if self.port else "", From 136d3dc20e2098b736e5b2008216591154a5ff14 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Wed, 2 Oct 2024 18:52:47 +0200 Subject: [PATCH 2/2] Location.canonical_path: use empty host if host is None, see #8446 % borg repo-info Location: rclone:///./pcloud:justtesting --- src/borg/helpers/parseformat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/borg/helpers/parseformat.py b/src/borg/helpers/parseformat.py index f4d028bd7..3d7031757 100644 --- a/src/borg/helpers/parseformat.py +++ b/src/borg/helpers/parseformat.py @@ -619,7 +619,7 @@ class Location: return "{}://{}{}{}{}".format( self.proto if self.proto else "???", f"{self.user}@" if self.user else "", - self._host, # needed for ipv6 addrs + self._host if self._host else "", # needed for ipv6 addrs f":{self.port}" if self.port else "", path, )