From 9257815ff18c22e615dbc854a5a173f2ebd5b8b8 Mon Sep 17 00:00:00 2001
From: Petr Skoda <commits@skodak.org>
Date: Thu, 26 Apr 2012 19:25:59 +0200
Subject: [PATCH] MDL-32607 prevent upgrade_set_timeout abort in CLI scripts

Credit goes to Michael Aherne, thanks.
---
 lib/moodlelib.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 2812280894c..a2ae7ab0eae 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -8564,9 +8564,13 @@ function upgrade_set_timeout($max_execution_time=300) {
     }
 
     if (!$upgraderunning) {
-        // upgrade not running or aborted
-        print_error('upgradetimedout', 'admin', "$CFG->wwwroot/$CFG->admin/");
-        die;
+        if (CLI_SCRIPT) {
+            // never stop CLI upgrades
+            $upgraderunning = 0;
+        } else {
+            // web upgrade not running or aborted
+            print_error('upgradetimedout', 'admin', "$CFG->wwwroot/$CFG->admin/");
+        }
     }
 
     if ($max_execution_time < 60) {