when releasing or rolling back, don’t chown the »current« symlink before we changed / created it. also don’t screw up the ssh cmdline if no username was given.

This commit is contained in:
Stefan Paletta
2015-03-13 11:51:27 +01:00
parent 0406c7de8a
commit a6bcfdaddd
4 changed files with 17 additions and 15 deletions
+5 -7
View File
@@ -136,14 +136,12 @@ class RollbackTask extends AbstractTask implements IsReleaseAware
$userGroup = '';
$resultFetch = $this->runCommandRemote('ls -ld ' . $rollbackTo . ' | awk \'{print \$3":"\$4}\'', $userGroup);
$tmplink = $rollbackTo . '.tmp';
$command = 'ln -sfn ' . $currentCopy . ' ' . $tmplink
. ' && '
. 'mv -T ' . $tmplink . ' ' . $symlink;
if ($resultFetch) {
$command .= ' && chown -h ' . $userGroup . ' ' . $symlink;
$tmplink = $symlink . '.tmp';
$command = "ln -sfn {$currentCopy} {$tmplink}";
if ($resultFetch && $userGroup) {
$command .= " && chown -h {$userGroup} ${tmplink}";
}
$command .= " && mv -T {$tmplink} {$symlink}";
$result = $this->runCommandRemote($command);