Fix #3316. updatedb fails to run updates when status checks fail.

drush-ops · Jan 20, 2018 · 44daf54 · 44daf54
1 parent 9e0ec0a
commit 44daf54
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/Commands/core/UpdateDBCommands.php b/src/Commands/core/UpdateDBCommands.php
@@ -40,7 +40,9 @@ public function updatedb($options = ['cache-clear' => true, 'entity-updates' =>
 
         // Check requirements before updating.
         if (!$this->updateCheckRequirements()) {
-            return;
+            if (!$this->io()->confirm(dt('Requirements check reports errors. Do you wish to continue?'))) {
+                throw new UserAbortException();
+            }
         }
 
         $return = drush_invoke_process('@self', 'updatedb:status', [], ['entity-updates' => $options['entity-updates'], 'post-updates' => $options['post-updates']]);
@@ -589,7 +591,7 @@ public function entityUpdatesMain()
      */
     public function updateCheckRequirements()
     {
-        $continue = true;
+        $return = true;
 
         \Drupal::moduleHandler()->resetImplementations();
         $requirements = update_check_requirements();
@@ -598,7 +600,7 @@ public function updateCheckRequirements()
         // If there are issues, report them.
         if ($severity != REQUIREMENT_OK) {
             if ($severity === REQUIREMENT_ERROR) {
-                $continue = false;
+                $return = false;
             }
             foreach ($requirements as $requirement) {
                 if (isset($requirement['severity']) && $requirement['severity'] != REQUIREMENT_OK) {
@@ -612,6 +614,6 @@ public function updateCheckRequirements()
             }
         }
 
-        return $continue;
+        return $return;
     }
 }