From 702f073f0a218b4c29343d0160613651cbe728e4 Mon Sep 17 00:00:00 2001 From: epriestley Date: Thu, 15 May 2014 07:36:44 -0700 Subject: [PATCH] Fix some logic in WaitForPreviousBuildStep Summary: Fixes T5062. See inlines. Test Plan: Did not test whatsoever. Reviewers: hach-que Reviewed By: hach-que Subscribers: epriestley Maniphest Tasks: T5062 Differential Revision: https://secure.phabricator.com/D9132 --- ...WaitForPreviousBuildStepImplementation.php | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/applications/harbormaster/step/HarbormasterWaitForPreviousBuildStepImplementation.php b/src/applications/harbormaster/step/HarbormasterWaitForPreviousBuildStepImplementation.php index 6cfa0759fa..1c54525064 100644 --- a/src/applications/harbormaster/step/HarbormasterWaitForPreviousBuildStepImplementation.php +++ b/src/applications/harbormaster/step/HarbormasterWaitForPreviousBuildStepImplementation.php @@ -73,26 +73,26 @@ final class HarbormasterWaitForPreviousBuildStepImplementation } } - $buildables = id(new HarbormasterBuildableQuery()) - ->setViewer(PhabricatorUser::getOmnipotentUser()) - ->withBuildablePHIDs($build_objects) - ->withManualBuildables(false) - ->execute(); - $buildable_phids = mpull($buildables, 'getPHID'); + if ($build_objects) { + $buildables = id(new HarbormasterBuildableQuery()) + ->setViewer(PhabricatorUser::getOmnipotentUser()) + ->withBuildablePHIDs($build_objects) + ->withManualBuildables(false) + ->execute(); + $buildable_phids = mpull($buildables, 'getPHID'); - if (!$buildable_phids) { - return array(); - } + if ($buildable_phids) { + $builds = id(new HarbormasterBuildQuery()) + ->setViewer(PhabricatorUser::getOmnipotentUser()) + ->withBuildablePHIDs($buildable_phids) + ->withBuildPlanPHIDs(array($plan->getPHID())) + ->execute(); - $builds = id(new HarbormasterBuildQuery()) - ->setViewer(PhabricatorUser::getOmnipotentUser()) - ->withBuildablePHIDs($buildable_phids) - ->withBuildPlanPHIDs(array($plan->getPHID())) - ->execute(); - - foreach ($builds as $build) { - if (!$build->isComplete()) { - $blockers[] = pht('Build %d', $build->getID()); + foreach ($builds as $build) { + if (!$build->isComplete()) { + $blockers[] = pht('Build %d', $build->getID()); + } + } } }