Merge branch '2.x-dev' into 3.0-m09

1 files changed, 5 insertions, 2 deletions

diff --git a/core/Updater.php b/core/Updater.php
index 581d6609a5..d53280f4da 100644
--- a/core/Updater.php
+++ b/core/Updater.php
@@ -12,6 +12,7 @@ use Piwik\Columns\Updater as ColumnUpdater;
 use Piwik\Container\StaticContainer;
 use Piwik\Updater\Migration;
 use Piwik\Updater\Migration\Db\Sql;
+use Piwik\Exception\MissingFilePermissionException;
 use Piwik\Updater\UpdateObserver;
 use Zend_Db_Exception;
 
@@ -264,8 +265,8 @@ class Updater
                 $this->markComponentSuccessfullyUpdated($componentName, $fileVersion);
             } catch (UpdaterErrorException $e) {
                 $this->executeListenerHook('onError', array($componentName, $fileVersion, $e));
-
                 throw $e;
+
             } catch (\Exception $e) {
                 $warningMessages[] = $e->getMessage();
 
@@ -583,7 +584,9 @@ class Updater
             // make sure to check for them here
             if ($e instanceof Zend_Db_Exception) {
                 throw new UpdaterErrorException($e->getMessage(), $e->getCode(), $e);
-            } else {
+            } else if ($e instanceof MissingFilePermissionException) {
+                throw new UpdaterErrorException($e->getMessage(), $e->getCode(), $e);
+            }{
                 throw $e;
             }
         }