feat: allow interpolation of original_host in Transfer.get

Found this useful when using connection `Group`s with remotes configured in an SSH-config file.
fabric · Mar 17, 2023 · 0134917 · 0134917
1 parent 5fb2775
commit 0134917
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/fabric/transfer.py b/fabric/transfer.py
@@ -138,6 +138,7 @@ def get(self, remote, local=None, preserve_mode=True):
                 host=self.connection.host,
                 user=self.connection.user,
                 port=self.connection.port,
+                original_host=getattr(self.connection, "original_host", self.connection.host),
                 dirname=posixpath.dirname(remote),
                 basename=remote_filename,
             )

diff --git a/tests/transfer.py b/tests/transfer.py
@@ -91,8 +91,8 @@ def remote_arg_cannot_be_empty_string(self, transfer):
 
         class local_arg_interpolation:
             def connection_params(self, transfer):
-                result = transfer.get("somefile", "{user}@{host}-{port}")
-                expected = "/local/{}@host-22".format(transfer.connection.user)
+                result = transfer.get("somefile", "{user}@{host}-{original_host}-{port}")
+                expected = "/local/{}@host-host-22".format(transfer.connection.user)
                 assert result.local == expected
 
             def connection_params_as_dir(self, transfer):