From 8f0f2d2286fe16742b19e0020d62710ba9c42b54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Georg=20Gro=C3=9Fberger?= <contact@grossberger-ge.org>
Date: Sun, 12 Nov 2017 15:47:01 +0100
Subject: [PATCH] Do not set host in rsync ssh command arg

---
 Mage/Task/AbstractTask.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Mage/Task/AbstractTask.php b/Mage/Task/AbstractTask.php
index f388e589..ae3f6e50 100644
--- a/Mage/Task/AbstractTask.php
+++ b/Mage/Task/AbstractTask.php
@@ -193,7 +193,9 @@ final protected function runCommandRemote($command, &$output = null, $cdToDirect
             $releasesDirectory = '';
         }
 
-        $localCommand = $this->buildSSHCommand();
+        $localCommand = $this->buildSSHCommand()
+            . ($this->getConfig()->deployment('user') != '' ? $this->getConfig()->deployment('user') . '@' : '')
+            . $this->getConfig()->getHostName();
 
         $remoteCommand = str_replace('"', '\"', $command);
         if ($cdToDirectoryFirst) {
@@ -309,9 +311,7 @@ protected function buildSSHCommand()
             . $needs_tty
             . ' -p ' . $this->getConfig()->getHostPort() . ' '
             . '-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no '
-            . $this->getConfig()->getConnectTimeoutOption()
-            . ($this->getConfig()->deployment('user') != '' ? $this->getConfig()->deployment('user') . '@' : '')
-            . $this->getConfig()->getHostName();
+            . $this->getConfig()->getConnectTimeoutOption();
 
         return $command;
     }