From f1753a5b10ea992541c22773102e41a2b40fbdda Mon Sep 17 00:00:00 2001
From: David Mudrak <david@moodle.com>
Date: Thu, 24 May 2012 14:31:13 +0200
Subject: [PATCH] MDL-32329 CLI install and upgrade scripts display plugins
 with unsatisfied dependencies

---
 admin/cli/install.php          | 4 +++-
 admin/cli/install_database.php | 4 +++-
 admin/cli/upgrade.php          | 4 +++-
 lang/en/admin.php              | 1 +
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/admin/cli/install.php b/admin/cli/install.php
index dc65e318d14..03723ed6061 100644
--- a/admin/cli/install.php
+++ b/admin/cli/install.php
@@ -677,7 +677,9 @@ if (!$envstatus) {
 
 // Test plugin dependencies.
 require_once($CFG->libdir . '/pluginlib.php');
-if (!plugin_manager::instance()->all_plugins_ok($version)) {
+$failed = array();
+if (!plugin_manager::instance()->all_plugins_ok($version, $failed)) {
+    cli_problem(get_string('pluginscheckfailed', 'admin', array('pluginslist' => implode(', ', array_unique($failed)))));
     cli_error(get_string('pluginschecktodo', 'admin'));
 }
 
diff --git a/admin/cli/install_database.php b/admin/cli/install_database.php
index 2524c4101eb..313f3521d40 100644
--- a/admin/cli/install_database.php
+++ b/admin/cli/install_database.php
@@ -161,7 +161,9 @@ if (!$envstatus) {
 
 // Test plugin dependencies.
 require_once($CFG->libdir . '/pluginlib.php');
-if (!plugin_manager::instance()->all_plugins_ok($version)) {
+$failed = array();
+if (!plugin_manager::instance()->all_plugins_ok($version, $failed)) {
+    cli_problem(get_string('pluginscheckfailed', 'admin', array('pluginslist' => implode(', ', array_unique($failed)))));
     cli_error(get_string('pluginschecktodo', 'admin'));
 }
 
diff --git a/admin/cli/upgrade.php b/admin/cli/upgrade.php
index 33e66cc3a4f..7eb7ea0971c 100644
--- a/admin/cli/upgrade.php
+++ b/admin/cli/upgrade.php
@@ -109,7 +109,9 @@ if (!$envstatus) {
 }
 
 // Test plugin dependencies.
-if (!plugin_manager::instance()->all_plugins_ok($version)) {
+$failed = array();
+if (!plugin_manager::instance()->all_plugins_ok($version, $failed)) {
+    cli_problem(get_string('pluginscheckfailed', 'admin', array('pluginslist' => implode(', ', array_unique($failed)))));
     cli_error(get_string('pluginschecktodo', 'admin'));
 }
 
diff --git a/lang/en/admin.php b/lang/en/admin.php
index 2ac7b1e2a6b..e5901232eec 100644
--- a/lang/en/admin.php
+++ b/lang/en/admin.php
@@ -753,6 +753,7 @@ $string['pleaserefreshregistration'] = 'Your site has been registered with moodl
 $string['pleaseregister'] = 'Please register your site to remove this button';
 $string['plugin'] = 'Plugin';
 $string['plugins'] = 'Plugins';
+$string['pluginscheckfailed'] = 'Dependencies check failed for {$a->pluginslist}';
 $string['pluginschecktodo'] = 'You must solve all the plugin requirements before proceeding to install this Moodle version!';
 $string['pluginsoverview'] = 'Plugins overview';
 $string['profilecategory'] = 'Category';