install_dump no longer throws exception if already installed
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 17 Jul 2017 08:10:27 +0000 (10:10 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 17 Jul 2017 10:45:14 +0000 (12:45 +0200)
Change-Id: I9dd25228df83cd271ed7832772652b863fa17b4f
Reviewed-on: http://gerrit.tine20.com/customers/5206
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
tine20/Setup/Controller.php
tine20/Setup/Frontend/Cli.php

index f601920..7f7fc73 100644 (file)
@@ -1445,7 +1445,8 @@ class Setup_Controller
         $this->_clearCache();
 
         if ($this->isInstalled('Tinebase')) {
-            throw new Setup_Exception('Tinebase already installed!');
+            Setup_Core::getLogger()->notice(__METHOD__ . '::' . __LINE__ . ' Tinebase is already installed.');
+            return false;
         }
 
         $mysqlBackupFile = null;
index 75ce2ac..c8fb487 100644 (file)
@@ -783,13 +783,16 @@ class Setup_Frontend_Cli
     }
 
     /**
+     * install tine20 from a dump (local dir or remote dir)
+     *
      * @param Zend_Console_Getopt $_opts
-     * @throws Exception
      */
     protected function _installDump(Zend_Console_Getopt $_opts)
     {
         $options = $this->_parseRemainingArgs($_opts->getRemainingArgs());
         Setup_Controller::getInstance()->installFromDump($options);
+
+        return 0;
     }
 
     /**