Skip to content

Commit

Permalink
Merge fd3508c into b3fe865
Browse files Browse the repository at this point in the history
  • Loading branch information
eiriksm committed Dec 22, 2022
2 parents b3fe865 + fd3508c commit 6cf1fe9
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions src/CosyComposer.php
Original file line number Diff line number Diff line change
Expand Up @@ -1456,7 +1456,11 @@ protected function handleIndividualUpdates($data, $lockdata, $cdata, $one_pr_per
if (!$lock_file_contents || ($should_update_beyond && $can_update_beyond)) {
$updater->executeRequire($version_to);
} else {
$this->log('Running composer update for package ' . $package_name);
if (!empty($item->child_with_update)) {
$this->log(sprintf('Running composer update for package %s to update the indirect dependency %s', $package_name, $item->child_with_update));
} else {
$this->log('Running composer update for package ' . $package_name);
}
$updater->executeUpdate();
}
$post_update_data = $updater->getPostUpdateData();
Expand Down Expand Up @@ -1589,7 +1593,11 @@ protected function handleIndividualUpdates($data, $lockdata, $cdata, $one_pr_per
'package' => $why_not_name,
'type' => 'stdout',
]);
$this->log("$package_name was not updated running composer update", Message::NOT_UPDATED, $not_updated_context);
if (!empty($item->child_with_update)) {
$this->log(sprintf("%s was not updated running composer update for direct dependency %s", $item->child_with_update, $package_name), Message::NOT_UPDATED, $not_updated_context);
} else {
$this->log("$package_name was not updated running composer update", Message::NOT_UPDATED, $not_updated_context);
}
} catch (ValidationFailedException $e) {
// @todo: Do some better checking. Could be several things, this.
$this->handlePossibleUpdatePrScenario($e, $branch_name, $pr_params, $prs_named, $config, $security_update);
Expand Down

0 comments on commit 6cf1fe9

Please sign in to comment.