From 9be085b2f34e9e42ce9821ffadaca98f989e4364 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 14 Jan 2013 08:44:48 +0100
Subject: Don't attempt to read system table if it doesn't exist

---
 bin/updatedb.sh | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'bin')

diff --git a/bin/updatedb.sh b/bin/updatedb.sh
index 3d37edf61..bc86d0496 100755
--- a/bin/updatedb.sh
+++ b/bin/updatedb.sh
@@ -55,16 +55,18 @@ if (!$DB->is_connected()) {
     exit(1);
 }
 
-// Read DB schema version from database
-$DB->query("SELECT " . $DB->quote_identifier('value')
-    ." FROM " . $DB->quote_identifier('system')
-    ." WHERE " . $DB->quote_identifier('name') ." = ?",
-    $opts['label'] . '-version');
-
-$row     = $DB->fetch_array();
-$version = $row[0];
+// Read DB schema version from database (if system table exists)
+if (in_array('system', (array)$DB->list_tables())) {
+    $DB->query("SELECT " . $DB->quote_identifier('value')
+        ." FROM " . $DB->quote_identifier('system')
+        ." WHERE " . $DB->quote_identifier('name') ." = ?",
+        $opts['label'] . '-version');
+
+    $row     = $DB->fetch_array();
+    $version = $row[0];
+}
 
-// no DB version, but release version is specified
+// DB version not found, but release version is specified
 if (!$version && $opts['version']) {
     // Map old release version string to DB schema version
     // Note: This is for backward compat. only, do not need to be updated
-- 
cgit v1.2.3