From 91c038f932e2509d1331b2ad2acb23ce2662d80d Mon Sep 17 00:00:00 2001
From: David Mudrak <david@moodle.com>
Date: Thu, 1 Mar 2012 01:56:53 +0100
Subject: [PATCH] MDL-31832 CLI upgrade checks if the upgrade is actually
 needed

---
 admin/cli/upgrade.php | 4 ++++
 lang/en/admin.php     | 1 +
 2 files changed, 5 insertions(+)

diff --git a/admin/cli/upgrade.php b/admin/cli/upgrade.php
index b223605e0b0..bbe3ce0351f 100644
--- a/admin/cli/upgrade.php
+++ b/admin/cli/upgrade.php
@@ -92,6 +92,10 @@ if ($version < $CFG->version) {
 $oldversion = "$CFG->release ($CFG->version)";
 $newversion = "$release ($version)";
 
+if (!moodle_needs_upgrading()) {
+    cli_error(get_string('cliupgradenoneed', 'core_admin', $newversion), 63);
+}
+
 // Test environment first.
 list($envstatus, $environment_results) = check_moodle_environment(normalize_version($release), ENV_SELECT_RELEASE);
 if (!$envstatus) {
diff --git a/lang/en/admin.php b/lang/en/admin.php
index dbf6a26d7cc..f9597da7515 100644
--- a/lang/en/admin.php
+++ b/lang/en/admin.php
@@ -106,6 +106,7 @@ $string['cliunknowoption'] = 'Unrecognised options:
   {$a}
 Please use --help option.';
 $string['cliupgradefinished'] = 'Command line upgrade completed successfully.';
+$string['cliupgradenoneed'] = 'No upgrade needed for the installed version {$a}. Thanks for coming anyway!';
 $string['cliyesnoprompt'] = 'type y (means yes) or n (means no)';
 $string['commentsperpage'] = 'Comments displayed per page';
 $string['commonfiltersettings'] = 'Common filter settings';