UpdateDatabase/MysqlEngineCharset.php

diff --git a/UpdateDatabase/MysqlEngineCharset.php b/UpdateDatabase/MysqlEngineCharset.php
index 374e6d7..a179187 100644 (file)
--- a/UpdateDatabase/MysqlEngineCharset.php
+++ b/UpdateDatabase/MysqlEngineCharset.php
@@ -13,8 +13,14 @@ class Pman_Core_UpdateDatabase_MysqlEngineCharset {
     
     function __construct()
     {
     
     function __construct()
     {

-          
-        $this->loadIniFiles(); //?? shared???
+        // this might get run before we have imported the database
+        // and hence not have any db.
+        try {
+            $this->loadIniFiles(); //?? shared???
+        } catch(PDO_DataObject_Exception_InvalidConfig $e) {
+            echo "SKipping MysqlEngineCharse - no database yet\n";
+            return;
+        }

         
         $dbo = DB_DataObject::factory('core_enum');
         if (is_a($dbo, 'PDO_DataObject')) {
         
         $dbo = DB_DataObject::factory('core_enum');
         if (is_a($dbo, 'PDO_DataObject')) {