Merge pull request andres-montanez#223 from isyndicate/release-task-o…

…wnership-fix-042915 resultFetch is always false when owner is specified in config
edpauto · May 5, 2015 · bbefc65 · bbefc65
2 parents 5bc6a0d + a3219e8
commit bbefc65
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/Mage/Task/BuiltIn/Deployment/ReleaseTask.php b/Mage/Task/BuiltIn/Deployment/ReleaseTask.php
@@ -70,18 +70,16 @@ public function run()
                     if (!empty($infoArray[3])) {
                         $group = $infoArray[3];
                     }
-                    $userGroup = $user . ':' . $group;
                 }
+                $userGroup = $user . ':' . $group;
             }
 
-            if ($resultFetch && $userGroup != '') {
-                $command = 'chown -R ' . $userGroup . ' ' . $currentCopy
-                    . ' && '
-                    . 'chown ' . $userGroup . ' ' . $releasesDirectory;
-                $result = $this->runCommandRemote($command);
-                if (!$result) {
-                    return $result;
-                }
+            $command = 'chown -R ' . $userGroup . ' ' . $currentCopy
+                . ' && '
+                . 'chown ' . $userGroup . ' ' . $releasesDirectory;
+            $result = $this->runCommandRemote($command);
+            if (!$result) {
+                return $result;
             }
 
             // Switch symlink and change owner