Merge branch 'master' into develop

Mage/Task/BuiltIn/Deployment/ReleaseTask.php

@@ -75,9 +75,10 @@ class ReleaseTask extends AbstractTask implements IsReleaseAware, SkipOnOverride
             }
 
             // Remove symlink if exists; create new symlink and change owners
-            $command = 'rm -f ' . $symlink
-                . ' ; '
-                . 'ln -sf ' . $currentCopy . ' ' . $symlink;
+            $tmplink = $currentCopy . '.tmp';
+            $command = 'ln -sfn ' . $currentCopy . ' ' . $tmplink
+                . ' && '
+                . 'mv -T ' . $tmplink . ' ' . $symlink;
 
             if ($resultFetch && $userGroup != '') {
                 $command .= ' && '

Mage/Task/BuiltIn/Releases/RollbackTask.php

@@ -133,9 +133,11 @@ class RollbackTask extends AbstractTask implements IsReleaseAware
 
                     $userGroup = '';
                     $resultFetch = $this->runCommandRemote('ls -ld ' . $rollbackTo . ' | awk \'{print \$3":"\$4}\'', $userGroup);
-                    $command = 'rm -f ' . $symlink
+
+                    $tmplink = $rollbackTo . '.tmp';
+                    $command = 'ln -sfn ' . $currentCopy . ' ' . $tmplink
                              . ' && '
-                             . 'ln -sf ' . $rollbackTo . ' ' . $symlink;
+                             . 'mv -T ' . $tmplink . ' ' . $symlink;
 
                     if ($resultFetch) {
                         $command .= ' && chown -h ' . $userGroup . ' ' . $symlink;