Merge pull request #8447 from ThomasWaldmann/fix-canonical-path-rclone

Location.canonical_path: some fixes, see #8446
borgbackup · Oct 2, 2024 · 349e6e3 · 349e6e3
2 parents 789ffb0 + 136d3dc
commit 349e6e3
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/borg/helpers/parseformat.py b/src/borg/helpers/parseformat.py
@@ -616,9 +616,10 @@ def canonical_path(self):
                 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
+                self._host if self._host else "",  # needed for ipv6 addrs
                 f":{self.port}" if self.port else "",
                 path,
             )