]> git.openpandora.org Git - openembedded.git/commitdiff
feed-browser: exit if database cannot be found or created
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 5 Jul 2007 15:37:56 +0000 (15:37 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 5 Jul 2007 15:37:56 +0000 (15:37 +0000)
contrib/feed-browser/includes/functions.inc
contrib/feed-browser/index.php
contrib/feed-browser/update.php

index 5549aa578d142c9710b65bd72036ddf77e3ddf05..ad8e57e93be32db196ede01089e7f5f3f16be2c9 100644 (file)
@@ -422,8 +422,12 @@ function sectionslist()
 
 function check_database()
 {
-       if($db = sqlite_open(DB_FILENAME))
+       $db_exists = FALSE;
+
+       if(file_exists(DB_FILENAME) AND $db = sqlite_open(DB_FILENAME))
        {
+               $db_exists = TRUE;
+
                //initialize db
                if (db_table_exists ($db, 'packages') === FALSE)
                {  
@@ -461,6 +465,8 @@ function check_database()
 
                sqlite_close($db);
        }
+
+       return $db_exists;
 }
 
 
index afa4c1a36ab7c17a08b9991c95a51d7558a3cc0c..a6c9206073ac79ec18113ab1c8ee828e5bc07942 100644 (file)
 require_once 'includes/config.inc';
 require_once 'includes/functions.inc';
 
-check_database();
+if(!check_database())
+{
+       die("Database not found and cannot be created.");
+}
 
 $name = '';
 
index ed67d3b78abca341f3e1b6fbbed35e1173e5449c..387acf9caa66f73773aa790ca595c89622b21c73 100644 (file)
@@ -37,7 +37,10 @@ require_once 'includes/functions.inc';
    Description: IPv4 link-local address allocator
  */
 
-check_database();
+if(!check_database())
+{
+       die("Database not found and cannot be created.");
+}
 
 $feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds");