Merge pull request #93 from Quetzacoalt91/detect-error-step

Detect error step
PrestaShop · Jun 29, 2018 · 7445c30 · 7445c30
2 parents f377a55 + 0178055
commit 7445c30
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/classes/TaskRunner/AllUpgradeTasks.php b/classes/TaskRunner/AllUpgradeTasks.php
@@ -56,7 +56,7 @@ public function run()
             $this->step = $result->getNext();
         }
 
-        return (int) ($this->error || $this->next === 'error');
+        return (int) ($this->error || $this->step === 'error');
     }
 
     /**

diff --git a/classes/TaskRunner/Upgrade/Download.php b/classes/TaskRunner/Upgrade/Download.php
@@ -78,7 +78,7 @@ public function run()
                     $this->logger->info($this->translator->trans('Download complete. Now extracting...', array(), 'Modules.Autoupgrade.Admin'));
                 } else {
                     $this->logger->error($this->translator->trans('Download complete but MD5 sum does not match (%s).', array($md5file), 'Modules.Autoupgrade.Admin'));
-                    $this->logger->info($this->translator->trans('Download complete but MD5 sum does not match (%s). Operation aborted.', array(), 'Modules.Autoupgrade.Admin'));
+                    $this->logger->info($this->translator->trans('Download complete but MD5 sum does not match (%s). Operation aborted.', array($md5file), 'Modules.Autoupgrade.Admin'));
                     $this->next = 'error';
                 }
             } else {
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,7 +56,7 @@ public function run() @@
                 $this->step = $result->getNext();
             }
-            return (int) ($this->error || $this->next === 'error');
+            return (int) ($this->error || $this->step === 'error');
         }
         /**
@@ Expand Down @@